Update TorBlock to master

Change-Id: Iaec6dc00e7b7e1e44862d8d2da8f6508542d8d13