commit 382dbe9819367cb838f1099f5f29897f8f5f8f51 Merge: df731ba bc56918 Author: Nick Mathewson nickm@torproject.org Date: Fri May 17 14:54:19 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug8846 | 4 ++++ src/or/connection_edge.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)