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

Merge branch 'maint-0.3.5' into release-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(-)