[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1685/head'

[nickm at torproject.org]

commit caa392a73ad6c8e215a4686955c9de98eeb07661
Merge: 7ba7f9c0d 93cb8072b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 24 07:45:20 2020 -0500

    Merge remote-tracking branch 'tor-github/pr/1685/head'

 changes/bug32709                         |   4 +
 doc/tor.1.txt                            |  13 +
 scripts/maint/practracker/exceptions.txt |   2 +-
 src/app/config/config.c                  |   2 +
 src/core/crypto/hs_ntor.c                |  44 +++-
 src/core/crypto/hs_ntor.h                |  21 +-
 src/core/or/circuitbuild.c               |   4 +-
 src/core/or/circuitbuild.h               |   3 +-
 src/feature/hs/hs_cell.c                 | 138 +++++++----
 src/feature/hs/hs_cell.h                 |  15 +-
 src/feature/hs/hs_circuit.c              |  57 ++++-
 src/feature/hs/hs_circuit.h              |  11 +-
 src/feature/hs/hs_client.c               |  11 +-
 src/feature/hs/hs_common.c               |  50 +++-
 src/feature/hs/hs_common.h               |   7 +-
 src/feature/hs/hs_config.c               |  25 +-
 src/feature/hs/hs_descriptor.c           |  26 +-
 src/feature/hs/hs_descriptor.h           |   7 +-
 src/feature/hs/hs_ob.c                   | 408 +++++++++++++++++++++++++++++++
 src/feature/hs/hs_ob.h                   |  40 +++
 src/feature/hs/hs_service.c              |  26 +-
 src/feature/hs/hs_service.h              |  15 +-
 src/feature/hs/include.am                |   2 +
 src/feature/nodelist/nodelist.c          |   4 +-
 src/feature/nodelist/nodelist.h          |   4 +-
 src/lib/ctime/di_ops.c                   |  27 ++
 src/lib/ctime/di_ops.h                   |   2 +
 src/test/fuzz/fuzz_hsdescv3.c            |   7 +-
 src/test/hs_test_helpers.c               |  51 +++-
 src/test/hs_test_helpers.h               |  15 +-
 src/test/include.am                      |   1 +
 src/test/test.c                          |   1 +
 src/test/test.h                          |   1 +
 src/test/test_hs_cache.c                 |  21 +-
 src/test/test_hs_client.c                |   7 +-
 src/test/test_hs_common.c                |   6 +-
 src/test/test_hs_descriptor.c            |  28 +--
 src/test/test_hs_ntor.c                  |   8 +-
 src/test/test_hs_ntor_cl.c               |  16 +-
 src/test/test_hs_ob.c                    | 268 ++++++++++++++++++++
 src/test/test_hs_service.c               | 356 ++++++++++++++++++++++++++-
 src/test/test_util.c                     |  30 +++
 42 files changed, 1598 insertions(+), 186 deletions(-)

diff --cc scripts/maint/practracker/exceptions.txt
index 9d38cf9d3,09c496c6d..b4ef1e51a
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@@ -244,8 -248,9 +244,8 @@@ problem function-size /src/feature/hibe
  problem function-size /src/feature/hs/hs_cell.c:hs_cell_build_establish_intro() 115
  problem function-size /src/feature/hs/hs_cell.c:hs_cell_parse_introduce2() 152
  problem function-size /src/feature/hs/hs_client.c:send_introduce1() 103
 -problem function-size /src/feature/hs/hs_client.c:hs_config_client_authorization() 107
  problem function-size /src/feature/hs/hs_common.c:hs_get_responsible_hsdirs() 102
- problem function-size /src/feature/hs/hs_config.c:config_service_v3() 107
+ problem function-size /src/feature/hs/hs_config.c:config_service_v3() 128
  problem function-size /src/feature/hs/hs_config.c:config_generic_service() 138
  problem function-size /src/feature/hs/hs_descriptor.c:desc_encode_v3() 101
  problem function-size /src/feature/hs/hs_descriptor.c:decrypt_desc_layer() 111