commit 34e4122025791d1a607426e5e543d6312872b9dd Merge: 649104fdb 2f17743d6 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 8 20:31:57 2017 -0400

Merge branch 'ticket20657_nickm_bugfixes_squashed'

src/ext/ed25519/donna/ed25519_tor.c | 8 +- src/ext/ed25519/ref10/blinding.c | 4 +- src/or/circuitlist.c | 43 + src/or/circuitlist.h | 1 + src/or/circuituse.c | 48 +- src/or/circuituse.h | 3 +- src/or/connection_edge.c | 137 +- src/or/directory.c | 93 +- src/or/directory.h | 4 + src/or/hs_cache.c | 6 +- src/or/hs_cell.c | 584 +++++++ src/or/hs_cell.h | 75 + src/or/hs_circuit.c | 832 ++++++++++ src/or/hs_circuit.h | 34 + src/or/hs_common.c | 820 +++++++++- src/or/hs_common.h | 122 +- src/or/hs_descriptor.c | 252 ++- src/or/hs_descriptor.h | 22 +- src/or/hs_ident.c | 13 +- src/or/hs_ident.h | 24 +- src/or/hs_intropoint.c | 16 + src/or/hs_intropoint.h | 10 +- src/or/hs_service.c | 2749 +++++++++++++++++++++++++++++--- src/or/hs_service.h | 126 +- src/or/include.am | 4 +- src/or/main.c | 33 +- src/or/networkstatus.c | 15 +- src/or/networkstatus.h | 1 + src/or/nodelist.c | 95 ++ src/or/or.h | 20 +- src/or/parsecommon.c | 2 +- src/or/parsecommon.h | 3 +- src/or/rendcommon.c | 4 +- src/or/rendservice.c | 171 +- src/or/rendservice.h | 17 +- src/or/routerparse.c | 9 +- src/or/shared_random.c | 46 + src/or/shared_random.h | 3 + src/or/shared_random_state.c | 38 +- src/or/shared_random_state.h | 5 + src/or/statefile.c | 2 + src/test/ed25519_exts_ref.py | 6 +- src/test/ed25519_vectors.inc | 32 +- src/test/hs_test_helpers.c | 30 +- src/test/hs_test_helpers.h | 3 + src/test/include.am | 3 + src/test/test.c | 3 + src/test/test.h | 3 + src/test/test_hs_cache.c | 8 +- src/test/test_hs_cell.c | 130 ++ src/test/test_hs_common.c | 507 ++++++ src/test/test_hs_config.c | 2 +- src/test/test_hs_descriptor.c | 18 +- src/test/test_hs_intropoint.c | 297 ++-- src/test/test_hs_ntor.c | 114 ++ src/test/test_hs_service.c | 1361 ++++++++++++---- src/test/test_shared_random.c | 120 ++ src/trunnel/ed25519_cert.h | 4 + src/trunnel/ed25519_cert.trunnel | 6 + src/trunnel/hs/cell_rendezvous.c | 292 ++++ src/trunnel/hs/cell_rendezvous.h | 118 ++ src/trunnel/hs/cell_rendezvous.trunnel | 18 + src/trunnel/include.am | 2 + 63 files changed, 8509 insertions(+), 1062 deletions(-)