[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket21979_032_04'

[nickm at torproject.org]

commit ef4ea864ea66059f7fd71ac68cfe6067f32149f1
Merge: 62d241a 965e3a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 13 17:23:37 2017 -0400

    Merge remote-tracking branch 'dgoulet/ticket21979_032_04'

 src/or/circuitlist.h         |   1 +
 src/or/config.c              |   7 +-
 src/or/hs_common.c           | 216 ++++++++++++++
 src/or/hs_common.h           |  38 ++-
 src/or/hs_config.c           | 582 +++++++++++++++++++++++++++++++++++++
 src/or/hs_config.h           |  24 ++
 src/or/hs_descriptor.c       |   6 +-
 src/or/hs_intropoint.h       |  12 +
 src/or/hs_service.c          | 665 ++++++++++++++++++++++++++++++++++++++++++-
 src/or/hs_service.h          | 231 ++++++++++++++-
 src/or/include.am            |  24 +-
 src/or/main.c                |  10 +-
 src/or/rendservice.c         | 356 ++++++++---------------
 src/or/rendservice.h         |  11 +-
 src/test/hs_build_address.py |  37 +++
 src/test/include.am          |   1 +
 src/test/test.c              |   1 +
 src/test/test.h              |   1 +
 src/test/test_helpers.c      |  42 ++-
 src/test/test_helpers.h      |   1 +
 src/test/test_hs.c           |  22 +-
 src/test/test_hs_config.c    | 477 +++++++++++++++++++++++++++++++
 src/test/test_hs_service.c   | 249 ++++++++++++++++
 23 files changed, 2730 insertions(+), 284 deletions(-)