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

[nickm at torproject.org]

commit daeaa9ff04f53cea00c5fbb305e92df771ee9114
Merge: ab4c6b6 93be3a8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 3 13:34:20 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.3

 Makefile.am              |   33 +++++++++++++--------------
 changes/bug6043          |    6 +++++
 changes/bug6480          |    5 ++++
 changes/bug6490          |    4 +++
 changes/bug6500          |    2 +
 changes/bug6530          |    5 ++++
 changes/pathsel-BUGGY-a  |   14 +++++++++++
 doc/tor-rpm-creation.txt |   56 +++++++++++++++++++++++++++++++++++----------
 doc/tor.1.txt            |    4 +-
 doc/torify.1.txt         |    2 +-
 src/or/config.c          |   29 +++++++++++++++++++++++
 src/or/dns.c             |   30 ++++++++++++++----------
 src/or/routerlist.c      |   31 +++++++++++++++++++------
 src/or/routerparse.c     |    2 +-
 tor.spec.in              |   27 +++++++++++++---------
 15 files changed, 185 insertions(+), 65 deletions(-)