Update TorBlock to master

Change-Id: I57bf33f3a27c9767f8ffedc1442d44499e6501b2