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

[arma@xxxxxxxxxxxxxx]

commit 2db88eae33f818dc33a85132b5b7512980b33571
Merge: e0f7070 5f2a1a7
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Fri May 13 23:38:26 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug1352          |    4 ++
 changes/bug2503          |    4 ++
 changes/bug3122_memcmp   |    7 +++
 changes/bug3135          |    6 ++
 changes/feature3076      |   14 +++++
 changes/md_cache_replace |    6 ++
 configure.in             |   18 ++++++
 doc/tor.1.txt            |   49 ++++++++++++-----
 src/common/Makefile.am   |    4 +-
 src/common/address.c     |   32 +++++++++++-
 src/common/address.h     |    1 +
 src/common/compat.c      |    4 +-
 src/common/container.c   |   10 ++--
 src/common/container.h   |    4 +-
 src/common/crypto.c      |    2 +-
 src/common/di_ops.c      |  133 ++++++++++++++++++++++++++++++++++++++++++++++
 src/common/di_ops.h      |   30 ++++++++++
 src/common/torgzip.c     |    2 +-
 src/common/util.c        |   21 +++++---
 src/common/util.h        |    5 +-
 src/or/circuitbuild.c    |   12 ++--
 src/or/circuitlist.c     |   10 ++--
 src/or/circuituse.c      |    4 +-
 src/or/config.c          |   63 +++++++++++-----------
 src/or/connection.c      |   85 ++++++++++++++++++++++-------
 src/or/connection_edge.c |    4 +-
 src/or/connection_or.c   |   10 ++--
 src/or/control.c         |  119 ++++++++++++++++++++++++++++++++++++++---
 src/or/control.h         |    2 +
 src/or/directory.c       |   34 +++++++-----
 src/or/dirserv.c         |   18 +++---
 src/or/dirvote.c         |   40 +++++++-------
 src/or/eventdns.c        |    4 +-
 src/or/main.c            |    6 ++-
 src/or/microdesc.c       |    9 ++--
 src/or/networkstatus.c   |   40 +++++++-------
 src/or/onion.c           |    4 +-
 src/or/or.h              |    9 +++
 src/or/relay.c           |    2 +-
 src/or/rendclient.c      |    6 +-
 src/or/rendcommon.c      |    8 ++--
 src/or/rendmid.c         |    2 +-
 src/or/rendservice.c     |   16 +++---
 src/or/rephist.c         |    4 +-
 src/or/router.c          |   44 +++++++++++++---
 src/or/router.h          |    3 +
 src/or/routerlist.c      |   64 +++++++++++-----------
 src/or/routerparse.c     |   33 ++++++------
 src/test/test_util.c     |   54 +++++++++++++++++++
 49 files changed, 801 insertions(+), 264 deletions(-)

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