commit 0af0f78dffc14919052d235de51a8fee71aaf1a5 Merge: a3e6f2467 702fd6f0f Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 18 13:52:39 2018 -0500

Merge branch 'maint-0.3.5'

changes/ticket28881 | 4 ++++ src/app/config/config.c | 2 ++ 2 files changed, 6 insertions(+)