[tor-commits] [gettor/master] Merge branch 'master' of https://github.com/thetorproject/gettor