Updating TorBlock to master again

Change-Id: I2b3c698bf2c78b031369f0efb4ab90765f1c7c44