diff options
author | teor <teor@torproject.org> | 2019-10-23 08:28:03 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-10-23 08:28:03 +1000 |
commit | 003be727c4a88c04424cb13429cf36f887e92f5c (patch) | |
tree | 34ec38a8bf1969bcf4bd833da0d1ae485a1af942 /src/feature/hs/hs_circuit.h | |
parent | 1ea19d7a5bf538f5b9f0988c2375966f88d87867 (diff) | |
parent | 41bc1fac8e77e399572e020c5ba59462afd75f4b (diff) | |
download | tor-003be727c4a88c04424cb13429cf36f887e92f5c.tar.gz tor-003be727c4a88c04424cb13429cf36f887e92f5c.zip |
Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5
Diffstat (limited to 'src/feature/hs/hs_circuit.h')
-rw-r--r-- | src/feature/hs/hs_circuit.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/feature/hs/hs_circuit.h b/src/feature/hs/hs_circuit.h index b8d8b25add..e168b301f1 100644 --- a/src/feature/hs/hs_circuit.h +++ b/src/feature/hs/hs_circuit.h @@ -26,7 +26,8 @@ void hs_circ_service_rp_has_opened(const hs_service_t *service, origin_circuit_t *circ); int hs_circ_launch_intro_point(hs_service_t *service, const hs_service_intro_point_t *ip, - extend_info_t *ei); + extend_info_t *ei, + bool direct_conn); int hs_circ_launch_rendezvous_point(const hs_service_t *service, const curve25519_public_key_t *onion_key, const uint8_t *rendezvous_cookie); |