Update TorBlock to master

Change-Id: I0a21700a41c08cc7c362102b8cd3226cd4220b3d