Update TorBlock to master

Change-Id: Iee764f30aa546ed8aabed234ff93f0a04b1e7973