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

[nickm at torproject.org]

commit 9f950d80c3547aac8778478a03c1f2c752ef876a
Merge: 390728d 967b4e7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 18 09:39:32 2014 -0400

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

 README                                    |    9 +-
 changes/bug11200-caching                  |    7 +
 changes/bug12730-systemd-verify-config    |    3 +
 changes/bug12731-systemd-no-run-as-daemon |    9 +
 changes/bug12830                          |    4 +
 changes/bug12848                          |    4 +
 changes/bug12864                          |    7 +
 changes/geoip-august2014                  |    3 +
 changes/geoip6-august2014                 |    3 +
 changes/test.h_msvc                       |    3 +
 contrib/dist/tor.service.in               |    5 +-
 doc/tor.1.txt                             |   11 +-
 src/config/geoip                          | 5217 +++++++++++++++++++++--------
 src/config/geoip6                         | 2012 ++++-------
 src/or/channel.c                          |    8 +
 src/or/circuitbuild.c                     |   12 +-
 src/or/config.c                           |   14 +-
 src/or/config.h                           |    2 +-
 src/or/control.c                          |    1 +
 src/or/directory.c                        |    2 +-
 src/or/ext_orport.c                       |    1 +
 src/or/nodelist.c                         |   21 +-
 src/or/or.h                               |    2 +
 src/or/routerlist.c                       |    4 +-
 src/test/test.h                           |    2 +-
 src/test/test_buffers.c                   |    3 -
 26 files changed, 4621 insertions(+), 2748 deletions(-)