Merge remote-tracking branch 'public/feature9777_024_squashed'

Conflicts:
	src/or/circuitbuild.c

1 files changed, 1 insertions, 0 deletions

diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h
index bf3d1b4677..1c8cf7de24 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);