commit db2c2a69091724037e0e6dd0c58f0b18558ce437 Merge: 1b312f7 c553288 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 31 14:08:28 2013 -0400

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

changes/bug9731 | 3 +++ src/or/connection.c | 6 ++++++ 2 files changed, 9 insertions(+)