[tor-commits] [tor/master] Merge branch 'feature3630-rebased'

[nickm@xxxxxxxxxxxxxx]

commit 5a8dcca8f7f8637792d63a9aec1408da26c7cbe6
Merge: 40288e1 fee094a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Sep 22 15:54:40 2011 -0400

    Merge branch 'feature3630-rebased'

 changes/feature3630          |    8 +++
 doc/tor.1.txt                |    7 +++
 src/common/compat_libevent.c |   34 ++++++++-----
 src/common/compat_libevent.h |    2 +-
 src/or/config.c              |   13 +++++
 src/or/connection.c          |   71 ++++++++++++++++-----------
 src/or/connection_or.c       |    7 ++-
 src/or/main.c                |  110 ++++++++++++++++++++++++++++++++---------
 src/or/or.h                  |    2 +
 9 files changed, 185 insertions(+), 69 deletions(-)

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