Update TorBlock to master

Change-Id: Iaff800fa24beedb65fbbff4a86d636232bdbefc4