[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit 0b6fe3c1230a7d135a6a5541b2abb8f6641cc48e
Merge: 2d92f4c19 3618bd616
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 5 16:41:35 2018 -0500

    Merge branch 'maint-0.3.2'

 changes/ticket24681 | 6 ++++++
 doc/tor.1.txt       | 3 ++-
 src/or/config.c     | 9 ++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)