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

[nickm at torproject.org]

commit 8f689e0eb2b9c7bd51e4ddfe5e9f57d72fb45385
Merge: 82b128277 281854bab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 14 10:48:01 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27708 | 4 ++++
 src/or/config.c  | 1 +
 2 files changed, 5 insertions(+)