diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-07 10:47:34 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-07 10:47:34 -0500 |
| commit | babbd3ff08496bfd3d99f05257279ff6135fb027 (patch) | |
| tree | 5226404947be461b8339b9052811185dde166356 /src/or/circuitlist.h | |
| parent | 372adfa09a143490dfc058a6e2db78ca27ef9399 (diff) | |
| parent | 1068e50aecefac8469991884afc08b6ecb24e740 (diff) | |
| download | tor-babbd3ff08496bfd3d99f05257279ff6135fb027.tar tor-babbd3ff08496bfd3d99f05257279ff6135fb027.tar.gz | |
Merge remote-tracking branch 'public/feature9777_024_squashed'
Conflicts:
src/or/circuitbuild.c
Diffstat (limited to 'src/or/circuitlist.h')
| -rw-r--r-- | src/or/circuitlist.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index bf3d1b467..1c8cf7de2 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -56,6 +56,7 @@ void circuit_mark_all_dirty_circs_as_unusable(void); void circuit_mark_for_close_(circuit_t *circ, int reason, int line, const char *file); int circuit_get_cpath_len(origin_circuit_t *circ); +void circuit_clear_cpath(origin_circuit_t *circ); crypt_path_t *circuit_get_cpath_hop(origin_circuit_t *circ, int hopnum); void circuit_get_all_pending_on_channel(smartlist_t *out, channel_t *chan); |