commit 7f59b9fb1fdc4519e663fa82e416eccae88e8934 Merge: b1ae2fd65 ab6534781 Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 8 08:37:46 2019 -0500

Merge branch 'maint-0.3.5'

changes/bug29040 | 4 ++++ src/app/config/config.c | 16 ++++++++++++---- src/app/config/config.h | 10 ++++++++++ src/feature/hs/hs_client.c | 6 +++--- 4 files changed, 29 insertions(+), 7 deletions(-)