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

[nickm at torproject.org]

commit bdfb399867e697e1afcbe0927a7aba685a587b1c
Merge: 879b1e1 cc21e56
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 15 16:10:59 2012 -0400

    Merge remote-tracking branch 'public/xxx023'

 changes/check_correct_flav_sigs |    4 ++++
 changes/descriptor_limit        |    2 ++
 changes/log_bad_md_entry        |    3 +++
 changes/move_cached_gtod        |    3 +++
 src/common/address.c            |    2 +-
 src/common/compat.c             |   19 ++++++++++++++-----
 src/common/compat_libevent.c    |   34 ++++++++++++++++++++++++++++++++++
 src/common/compat_libevent.h    |    3 +++
 src/or/buffers.c                |    6 +++---
 src/or/circuitbuild.c           |    8 ++++----
 src/or/circuitlist.c            |    4 ++--
 src/or/circuituse.c             |    4 ++--
 src/or/config.c                 |    4 ++--
 src/or/connection.c             |   13 +++++++++----
 src/or/connection_edge.c        |   18 +++++++++---------
 src/or/connection_or.c          |    2 +-
 src/or/control.c                |   23 +++--------------------
 src/or/directory.c              |    9 +++++++--
 src/or/dirserv.c                |   12 ++++++------
 src/or/dnsserv.c                |    2 +-
 src/or/main.c                   |    7 ++-----
 src/or/microdesc.c              |   11 ++++++++---
 src/or/networkstatus.c          |    2 +-
 src/or/relay.c                  |   27 ++-------------------------
 src/or/relay.h                  |    2 --
 src/or/rendclient.c             |    2 +-
 src/or/rendservice.c            |    4 ++--
 src/or/rephist.c                |    2 +-
 src/or/routerlist.c             |   10 +++++-----
 src/or/routerparse.c            |    2 +-
 src/or/transports.c             |    2 +-
 31 files changed, 137 insertions(+), 109 deletions(-)