[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug3940_redux'

commit 5a3d9636f5e0ead80a46163af9ffadcbf6d5195f Merge: 62a77f1 ba9a121 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 13 11:40:38 2012 -0400

Merge remote-tracking branch 'public/bug3940_redux'

changes/bug3940_redux | 5 ++ src/or/connection_edge.c | 104 ++++++++++++++++++++++++++++++--------------- src/or/connection_edge.h | 5 +- src/or/or.h | 5 ++ src/or/relay.c | 2 +- src/test/test.c | 8 ++-- src/test/test_config.c | 46 ++++++++++---------- 7 files changed, 110 insertions(+), 65 deletions(-)