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

[arma at torproject.org]

commit acc54d32b61161c8b27e1c347ab97a2fe418638c
Merge: 2bd2c10 1f67827
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri May 13 23:37:50 2011 -0400

    Merge branch 'maint-0.2.1' into release-0.2.1

 changes/bug3122_memcmp   |    7 +++
 changes/bug3135          |    6 ++
 configure.in             |   18 ++++++
 src/common/Makefile.am   |    4 +-
 src/common/address.c     |    2 +-
 src/common/compat.c      |    4 +-
 src/common/container.c   |    8 ++--
 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      |    2 +-
 src/or/config.c          |    2 +-
 src/or/connection_edge.c |    4 +-
 src/or/connection_or.c   |    8 ++--
 src/or/control.c         |   14 +++---
 src/or/directory.c       |   12 ++--
 src/or/dirserv.c         |   12 ++--
 src/or/dirvote.c         |   38 +++++++-------
 src/or/eventdns.c        |    2 +-
 src/or/networkstatus.c   |   34 ++++++------
 src/or/onion.c           |    4 +-
 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          |    6 +-
 src/or/routerlist.c      |   72 ++++++++++++------------
 src/or/routerparse.c     |   27 +++++-----
 src/or/test.c            |   55 +++++++++++++++++++
 37 files changed, 428 insertions(+), 170 deletions(-)