[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug21122'

[nickm at torproject.org]

commit 6c2b48dab73f7c4fb0ed79185b9f123dc2349be8
Merge: b9054c6 ceeaf04
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 09:23:02 2017 -0500

    Merge remote-tracking branch 'teor/bug21122'

 changes/bug21122 |  4 ++++
 doc/tor.1.txt    | 44 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 11 deletions(-)