[tor-commits] [tor/master] Merge branch 'ticket27547_035_01_squashed'

[nickm at torproject.org]

commit db27a70c9450495974ad0f2f5ee8c4d7454293f8
Merge: d44eb16b2 e7ab20710
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 13 11:48:13 2018 -0400

    Merge branch 'ticket27547_035_01_squashed'

 changes/ticket27547 |  7 +++++++
 doc/tor.1.txt       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)