commit a8fba6e1d0629cbb21f2627c1aaac36fa563f312 Merge: cc1f563df 702fd6f0f Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 18 13:52:39 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket28881 | 4 ++++ src/app/config/config.c | 2 ++ 2 files changed, 6 insertions(+)