[tor-commits] [tor/maint-0.3.3] Merge branch 'bug26913_033' into maint-0.3.3

[nickm at torproject.org]

commit aebe8a82c9a1a8ee1df9d1dbb82807d342f49203
Merge: 34e4d5a78 4fd761a41
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 15 16:47:22 2018 -0500

    Merge branch 'bug26913_033' into maint-0.3.3

 changes/ticket26913 |  7 +++++++
 doc/tor.1.txt       |  6 ++++--
 src/or/config.c     | 21 +++++++++++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)