commit 1ab85566d8cb8707ea29ab02b10edf2da5cfb1ca Merge: bd4c50f36 8f689e0eb Author: Nick Mathewson <nickm at torproject.org> Date: Fri Sep 14 10:48:01 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27708 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)