[tor-commits] [tor/master] Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org/user/andrea/tor

[andrea@xxxxxxxxxxxxxx]

commit 0523c8de7d7f775e9a89134340f88ae00bde158b
Merge: 713736a fc1a9a1
Author: Andrea Shepard <andrea@xxxxxxxxxxxxxx>
Date:   Sat Nov 10 03:24:41 2012 -0800

    Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org/user/andrea/tor

 changes/check_for_orconn_on_close |    4 ++
 src/or/connection.c               |   68 +++++++++++++++++++++++++++++++++---
 src/or/connection.h               |   48 +++++++++++++++++++++----
 src/or/connection_or.c            |    8 ++--
 4 files changed, 110 insertions(+), 18 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits