commit 5ca3de21244d373f4c79b00d676f561dd50df4a9 Merge: 9905289fe 7260d07fe Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 19 14:34:26 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 src/or/config.c | 2 ++ 1 file changed, 2 insertions(+)