[tor-commits] [tor/master] Merge branch 'tor-github/pr/1775'

[dgoulet at torproject.org]

commit 27e2989fe9877d52e2e1ce0855b67165bff7f455
Merge: 906130308 0dc25a4b6
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Mar 30 13:31:56 2020 -0400

    Merge branch 'tor-github/pr/1775'

 src/feature/hs/.may_include    |   1 +
 src/feature/hs/hs_config.c     | 513 +++++++++++++++++++----------------------
 src/feature/hs/hs_config.h     |   3 +-
 src/feature/hs/hs_options.inc  |  36 +++
 src/feature/hs/hs_opts_st.h    |  30 +++
 src/feature/hs/hs_service.c    |   1 +
 src/feature/hs/include.am      |   2 +
 src/feature/rend/rendservice.c | 214 ++++++++---------
 src/feature/rend/rendservice.h |   3 +-
 src/lib/encoding/confline.c    |  29 +++
 src/lib/encoding/confline.h    |   1 +
 src/test/test_hs_config.c      |  43 ++--
 src/test/test_util.c           |  51 ++++
 13 files changed, 517 insertions(+), 410 deletions(-)