diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-13 14:49:15 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-13 14:49:15 -0500 |
| commit | ecf61e924d5807420aaeee8620dc83f3b952d77f (patch) | |
| tree | 9d8c1578138951755c8a7ed2d1c876eb364c9245 /src/or/circuitlist.h | |
| parent | 745434d29a92da682f4c8d8fa70a563862e80ae7 (diff) | |
| parent | 8b9a2cb68b290e550695124d7ef0511225b451d5 (diff) | |
| download | tor-ecf61e924d5807420aaeee8620dc83f3b952d77f.tar.gz tor-ecf61e924d5807420aaeee8620dc83f3b952d77f.zip | |
Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025
Conflicts:
src/or/circuitlist.c
Diffstat (limited to 'src/or/circuitlist.h')
| -rw-r--r-- | src/or/circuitlist.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index 1c8cf7de24..f9b95da085 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -49,6 +49,8 @@ origin_circuit_t *circuit_get_next_by_pk_and_purpose(origin_circuit_t *start, const char *digest, uint8_t purpose); or_circuit_t *circuit_get_rendezvous(const char *cookie); or_circuit_t *circuit_get_intro_point(const char *digest); +void circuit_set_rendezvous_cookie(or_circuit_t *circ, const uint8_t *cookie); +void circuit_set_intro_point_digest(or_circuit_t *circ, const uint8_t *digest); origin_circuit_t *circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, int flags); void circuit_mark_all_unused_circs(void); |