commit 432852577000ab5eb07ae3ca961a36e5f6e796ba Merge: e8e89fd b0867fe Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 8 09:38:48 2015 -0500

Merge branch 'maint-0.2.4' into maint-0.2.5

changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)