[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2

[arma@xxxxxxxxxxxxxx]

commit cf53d77fe1bd9dc8926e9d63f00ba0f44cc5c25b
Merge: b5bc84d 4684ced
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Wed Oct 26 18:35:30 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/issue-2011-10-19L |   28 +++++++++++++
 changes/issue-2011-10-23G |    9 ++++
 src/common/tortls.c       |   93 ++++++++++++++++++++++++++-------------------
 src/or/command.c          |   13 +++++-
 src/or/config.c           |    2 +
 src/or/connection_or.c    |    7 +++
 src/or/dirserv.c          |   73 ++++++++++++++++++++++++++++++++++-
 src/or/or.h               |   10 +++++
 src/or/routerparse.c      |    3 +-
 src/or/routerparse.h      |    1 +
 10 files changed, 195 insertions(+), 44 deletions(-)



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