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

[arma at torproject.org]

commit aa985598f5914a1b858bf63536dd48ac8d7e0b33
Merge: 20c1d3d 1004489
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Jul 31 05:10:35 2012 -0400

    Merge branch 'maint-0.2.3' into release-0.2.3

 changes/bug6274           |    3 ++
 changes/bug6274_2         |    3 ++
 changes/bug6377           |    4 ++
 changes/bug6387           |    3 ++
 changes/bug6397           |    4 ++
 changes/bug6436           |    3 ++
 changes/cov709056         |    4 ++
 changes/port_doc          |    3 ++
 changes/smartlist_foreach |    8 +++++
 doc/asciidoc-helper.sh    |    4 ++-
 doc/tor.1.txt             |   11 ++++--
 src/common/container.h    |   24 ++++++++++------
 src/common/log.c          |    5 +--
 src/or/circuitbuild.c     |   24 +++++++--------
 src/or/config.c           |   27 ++++++++++++-----
 src/or/connection.c       |   15 ++++------
 src/or/connection_edge.c  |    5 +--
 src/or/control.c          |   24 ++++++---------
 src/or/cpuworker.c        |    5 +--
 src/or/directory.c        |   24 ++++++---------
 src/or/dirserv.c          |   28 ++++++++----------
 src/or/dirvote.c          |   69 ++++++++++++++++++++------------------------
 src/or/dns.c              |    2 +-
 src/or/geoip.c            |    4 +-
 src/or/main.c             |    5 +--
 src/or/networkstatus.c    |   32 ++++++++++-----------
 src/or/policies.c         |   14 ++++-----
 src/or/rendservice.c      |    8 ++--
 src/or/routerlist.c       |   53 +++++++++++++++-------------------
 src/or/routerparse.c      |    4 +-
 src/test/test.c           |    5 +--
 src/test/test_util.c      |    5 +--
 src/tools/tor-gencert.c   |    7 ++++-
 33 files changed, 230 insertions(+), 209 deletions(-)