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

[nickm at torproject.org]

commit 9a9d32fabc0899b50d1b06c37892b9eb556ee2cb
Merge: fa7261254 9b44bb49b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 29 12:02:44 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24050 | 5 +++++
 src/or/config.c  | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)