commit b4e8d8dc0e6f942346895a5cff123db3aa1f94d5 Merge: 9e2de8c a2754d4 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 6 16:29:08 2014 -0500

Merge remote-tracking branch 'public/bug9716_024' into maint-0.2.4

changes/bug9716 | 4 ++++ src/or/connection.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)