[tor-commits] [tor/master] Merge branch 'ticket29040_1_changes' into maint-0.3.5

[nickm at torproject.org]

commit ab6534781996404ca57e9f5b0cbdda998579c329
Merge: 4b36f9676 eca0f8780
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 8 08:37:43 2019 -0500

    Merge branch 'ticket29040_1_changes' into 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(-)