[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug21058_030_01'

[nickm at torproject.org]

commit d31209ad6f65c8a4725bbed3e614b9ccff24eb3f
Merge: 69cb6f3 5a83bb0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 18 09:18:01 2017 -0500

    Merge remote-tracking branch 'dgoulet/bug21058_030_01'

 changes/bug21058 |  3 +++
 doc/tor.1.txt    | 33 +++++++++++++++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)