commit 6a9c3d6e3a719ed4e72327320a2f0d1d86e11f9c Merge: b23086060 9b44bb49b Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 29 12:02:44 2017 -0500

Merge branch 'maint-0.3.2'

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