Merge pull request #5101 from wigyori/for-15.05-tor
authorZoltan Herpai <[email protected]>
Sat, 18 Nov 2017 11:57:25 +0000 (12:57 +0100)
committerGitHub <[email protected]>
Sat, 18 Nov 2017 11:57:25 +0000 (12:57 +0100)
CC: net/tor: fix build and upgrade to 0.2.9.11

Trivial merge