commit a726cd76df0205d573ce0a641b65a89c5f1ce3b4 Merge: c5c4ea2 6818028 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 4 12:26:43 2015 +0100

Merge remote-tracking branch 'public/bug15064_025' into maint-0.2.6

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