[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/ticket24343_033_01' into maint-0.3.3

[nickm at torproject.org]

commit d662d4470a9030ad485dde1eb5426f063f9c3cf1
Merge: 799c82be7 652d3a5b6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 15 21:05:08 2018 -0500

    Merge remote-tracking branch 'dgoulet/ticket24343_033_01' into maint-0.3.3

 changes/ticket24343 | 6 ++++++
 doc/tor.1.txt       | 8 ++++----
 src/or/config.c     | 5 +++--
 src/or/connection.c | 2 --
 src/or/main.c       | 2 +-
 src/or/or.h         | 5 +----
 6 files changed, 15 insertions(+), 13 deletions(-)