summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-08-22 09:37:31 -0400
committerNick Mathewson <nickm@torproject.org>2018-08-22 09:37:31 -0400
commitc1ad40627bbccf2682f56053c77ff719c822cbce (patch)
tree7c186d1fcf1d34e9bb28dc2085c82fbb9ddd2f2f /src/or
parenta5bbe3f1d0d8162e70af01f6b3956412dcc75946 (diff)
parent9068e2fa280395ba15d30465ec25141cff876922 (diff)
downloadtor-c1ad40627bbccf2682f56053c77ff719c822cbce.tar.gz
tor-c1ad40627bbccf2682f56053c77ff719c822cbce.zip
Merge branch 'maint-0.2.9' into maint-0.3.2
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection_edge.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f178917f0b..07c6ac88b4 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -4162,4 +4162,3 @@ connection_edge_free_all(void)
smartlist_free(pending_entry_connections);
pending_entry_connections = NULL;
}
-