commit a394a2dd86579495797432114f62ea3265ed5ed0 Merge: a9ef335c1 fd504587d Author: Nick Mathewson nickm@torproject.org Date: Mon May 14 14:25:07 2018 -0400
Merge branch 'bug25903_v5_squashed'
changes/ticket25903 | 6 ++ src/or/circuituse.c | 38 ++++++++ src/or/circuituse.h | 2 + src/or/connection_edge.c | 9 +- src/or/control.c | 15 ++- src/or/or.h | 24 ++++- src/or/relay.c | 45 ++++++++- src/or/relay.h | 4 + src/or/rendcommon.c | 6 ++ src/test/test_relaycell.c | 239 ++++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 377 insertions(+), 11 deletions(-)
diff --cc src/or/rendcommon.c index 3a7dfe28f,2a77b2ece..f3fa2f64d --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@@ -12,14 -12,10 +12,15 @@@
#include "or.h" #include "circuitbuild.h" + #include "circuituse.h" #include "config.h" #include "control.h" +#include "crypto_rand.h" +#include "crypto_util.h" +#include "hs_client.h" #include "hs_common.h" +#include "hs_intropoint.h" +#include "networkstatus.h" #include "rendclient.h" #include "rendcommon.h" #include "rendmid.h"