commit 19dbc385d540df70b5e9a6193248080a298577c3 Merge: 62743912b 7685c39f9 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 12 09:38:52 2018 -0400

Merge remote-tracking branch 'tor-github/pr/298'

changes/ticket25573 | 5 + src/core/include.am | 1 + src/core/or/circuitbuild.c | 3 +- src/core/or/circuitbuild.h | 3 +- src/core/or/circuitlist.c | 9 + src/core/or/connection_edge.c | 226 ++++++++++++++ src/core/or/connection_edge.h | 11 + src/core/or/half_edge_st.h | 34 ++ src/core/or/origin_circuit_st.h | 4 + src/core/or/relay.c | 75 ++++- src/feature/client/circpathbias.c | 63 ++++ src/feature/client/circpathbias.h | 1 + src/lib/container/smartlist.c | 2 +- src/lib/container/smartlist.h | 2 +- src/test/test_relaycell.c | 641 +++++++++++++++++++++++++++++++++++--- 15 files changed, 1034 insertions(+), 46 deletions(-)

diff --cc src/test/test_relaycell.c index a6c152f73,63820c996..eddba6591 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@@ -9,7 -9,8 +9,8 @@@ #include "core/mainloop/main.h" #include "app/config/config.h" #include "core/mainloop/connection.h" -#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_cipher.h" + #include "lib/crypt_ops/crypto_rand.h" #include "core/or/circuitbuild.h" #include "core/or/circuitlist.h" #include "core/or/connection_edge.h" @@@ -511,6 -1075,8 +1075,7 @@@ test_relaycell_resolved(void *arg struct testcase_t relaycell_tests[] = { { "resolved", test_relaycell_resolved, TT_FORK, NULL, NULL }, { "circbw", test_circbw_relay, TT_FORK, NULL, NULL }, + { "halfstream", test_halfstream_insertremove, TT_FORK, NULL, NULL }, + { "streamwrap", test_halfstream_wrap, TT_FORK, NULL, NULL }, END_OF_TESTCASES }; --