Merge remote-tracking branch 'saper/default_nickname'
commit2c5841a8b855b6340952a10b6014ec6cdd44ca87
authorNick Mathewson <nickm@torproject.org>
Mon, 7 May 2018 17:31:03 +0000 (7 13:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 May 2018 17:31:03 +0000 (7 13:31 -0400)
tree57c2e776b0bf2510418932866b223908064c5033
parenta1a32b483412deda5b7573c3120c85fe41e3dfd2
parent0c7740b7ded0eb26aca45a4b96d74a9293660edd
Merge remote-tracking branch 'saper/default_nickname'
doc/tor.1.txt