summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-10-14 23:06:43 -0400
committerNick Mathewson <nickm@torproject.org>2012-10-14 23:06:43 -0400
commit0d946e1773da2a7cf5fa22ff9c62700985b26f7f (patch)
tree04a57a5f470fa47badadeda8c8e3353db64e90d6 /src/or/circuitbuild.c
parent38b79473864fb662215761f650e8e03b7c518cd7 (diff)
parent3d31771da9fcd0be5db21ac19a34d978bfe6d78d (diff)
downloadtor-0d946e1773da2a7cf5fa22ff9c62700985b26f7f.tar.gz
tor-0d946e1773da2a7cf5fa22ff9c62700985b26f7f.zip
Merge remote-tracking branch 'arma/bug7029'
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 3e20797a6e..adf3c41fe3 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -5897,5 +5897,6 @@ entry_guards_free_all(void)
clear_bridge_list();
smartlist_free(bridge_list);
bridge_list = NULL;
+ circuit_build_times_free_timeouts(&circ_times);
}