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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3' into release-0.3.3

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