[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug3122_memcmp_023'

[nickm at torproject.org]

commit af85017177566a26d17076a256b3a4d5ae555170
Merge: 696cd1c 9e16a41
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 12 19:27:18 2011 -0400

    Merge remote-tracking branch 'public/bug3122_memcmp_023'

 changes/bug3122_memcmp   |    7 +++
 configure.in             |   18 ++++++
 src/common/Makefile.am   |    2 +
 src/common/address.c     |    2 +-
 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      |    2 +-
 src/or/connection_edge.c |    4 +-
 src/or/connection_or.c   |   10 ++--
 src/or/control.c         |   14 +++---
 src/or/directory.c       |   10 ++--
 src/or/dirserv.c         |   12 ++--
 src/or/dirvote.c         |   40 +++++++-------
 src/or/eventdns.c        |    4 +-
 src/or/microdesc.c       |    6 +-
 src/or/networkstatus.c   |   40 +++++++-------
 src/or/nodelist.c        |   12 ++--
 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          |    8 ++--
 src/or/routerlist.c      |   66 +++++++++++-----------
 src/or/routerparse.c     |   33 ++++++------
 src/test/test_util.c     |   55 +++++++++++++++++++
 37 files changed, 437 insertions(+), 183 deletions(-)