Merge remote-tracking branch 'weasel/bug19504'
commit11ba7f00371ef3ed7b9fd353aad4e3e672239a40
authorNick Mathewson <nickm@torproject.org>
Wed, 29 Jun 2016 20:18:00 +0000 (29 16:18 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 29 Jun 2016 20:18:00 +0000 (29 16:18 -0400)
treec670fa166b5e84973a7e1702a7b7c55a23cf6a2d
parentff5b10c9161f7ffd2fb2758241ff893b76c1807c
parent869e5688b7856b0ceb8290a76a651a7f4306e926
Merge remote-tracking branch 'weasel/bug19504'
doc/tor.1.txt