commit c387cc5022f84ebb452278747f36f1c7d8b32187 Merge: aa792fd 6a64563 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 7 11:17:53 2017 -0400

Merge branch 'ticket21859_032_01_squashed'

src/common/crypto.c | 12 ++ src/common/crypto.h | 5 + src/or/circuitbuild.c | 95 +++++++++++--- src/or/circuitbuild.h | 9 +- src/or/circuitlist.c | 2 + src/or/circuituse.c | 44 +++++-- src/or/command.c | 3 +- src/or/connection.c | 3 + src/or/connection_edge.c | 10 +- src/or/connection_edge.h | 3 +- src/or/cpuworker.c | 2 +- src/or/hs_circuit.c | 224 +++++++++++++++++++++++++++++++++ src/or/hs_circuit.h | 24 ++++ src/or/hs_client.c | 47 +++++++ src/or/hs_client.h | 16 +++ src/or/hs_common.h | 6 + src/or/hs_ident.c | 81 ++++++++++++ src/or/hs_ident.h | 124 +++++++++++++++++++ src/or/hs_ntor.c | 50 ++++---- src/or/hs_ntor.h | 24 ++-- src/or/include.am | 20 +-- src/or/or.h | 19 +++ src/or/rendclient.c | 52 +------- src/or/rendservice.c | 4 +- src/test/include.am | 2 + src/test/rend_test_helpers.c | 16 +++ src/test/rend_test_helpers.h | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_connection.c | 93 +------------- src/test/test_connection.h | 13 ++ src/test/test_helpers.c | 96 +++++++++++++++ src/test/test_helpers.h | 9 +- src/test/test_hs_client.c | 286 +++++++++++++++++++++++++++++++++++++++++++ src/test/test_hs_service.c | 94 +++++++++++++- src/test/test_rendcache.c | 16 --- 36 files changed, 1257 insertions(+), 250 deletions(-)