Update TorBlock to master

Change-Id: I0aa5d30836ca90d6988d8e736c27379cee679628