[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

[nickm at torproject.org]

commit 57ff37430385a7f21e04071eb5805b1381ef7a42
Merge: 115fb2a84 63312e029
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 15 16:47:25 2018 -0500

    Merge branch 'maint-0.3.4' into release-0.3.4

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