diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:20:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:20:59 -0500 |
| commit | 2cee38f76a46860e2fb29fbd95ba36b332aa38c6 (patch) | |
| tree | 3b2cbaeff1472c8d23c18f3e88bc4735bbb22bcc /src/or/circuitlist.h | |
| parent | b310929ee36f0a88389dca53124506115c850c3b (diff) | |
| parent | 20292ec4974b777d430e7962cc38349c5f82b220 (diff) | |
| download | tor-2cee38f76a46860e2fb29fbd95ba36b332aa38c6.tar.gz tor-2cee38f76a46860e2fb29fbd95ba36b332aa38c6.zip | |
Merge branch 'prop271_030_v1_squashed'
Diffstat (limited to 'src/or/circuitlist.h')
| -rw-r--r-- | src/or/circuitlist.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index b38b6d1afa..d83801a7a8 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -15,6 +15,7 @@ #include "testsupport.h" MOCK_DECL(smartlist_t *, circuit_get_global_list, (void)); +smartlist_t *circuit_get_global_origin_circuit_list(void); const char *circuit_state_to_string(int state); const char *circuit_purpose_to_controller_string(uint8_t purpose); const char *circuit_purpose_to_controller_hs_state_string(uint8_t purpose); @@ -73,6 +74,8 @@ void channel_note_destroy_pending(channel_t *chan, circid_t id); MOCK_DECL(void, channel_note_destroy_not_pending, (channel_t *chan, circid_t id)); +smartlist_t *circuit_find_circuits_to_upgrade_from_guard_wait(void); + #ifdef CIRCUITLIST_PRIVATE STATIC void circuit_free(circuit_t *circ); STATIC size_t n_cells_in_circ_queues(const circuit_t *c); |