Merge branch 'maint-0.3.5'
commit2b9a907bdccc588203d2110866d4e7bb72a25773
authorDavid Goulet <dgoulet@torproject.org>
Mon, 26 Nov 2018 19:59:24 +0000 (26 14:59 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Mon, 26 Nov 2018 19:59:24 +0000 (26 14:59 -0500)
tree40ce08ea30ac3392a948a0340ca1b6ccdc8c26cf
parent3741f9e524a2d3bd7239ca865d6169fd1e3dddb5
parent056ffdec4cd10aac964ca354115ef806869afe81
Merge branch 'maint-0.3.5'
doc/tor.1.txt