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

[nickm at torproject.org]

commit d4a2decc56cc5328c8edfde2cc512efd844cc32b
Merge: 236cf49 fd8284c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 25 12:43:41 2017 -0400

    Merge branch 'bug21715_031_01_squashed'

 changes/bug21715 |  5 +++++
 doc/tor.1.txt    | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)