[tor-commits] [tor/master] Merge branch 'bug9665_redux'

[nickm at torproject.org]

commit 84df7d73c9f8892220184e301627d5bddb9c3f79
Merge: bc0882c 74195db
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 7 22:20:13 2014 -0400

    Merge branch 'bug9665_redux'

 changes/bug9665        |    4 ++++
 src/or/connection_or.c |    6 ++++++
 src/or/or.h            |    3 ++-
 src/or/reasons.c       |    2 ++
 4 files changed, 14 insertions(+), 1 deletion(-)