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

[arma at torproject.org]

commit 8fd9644f172a03f87a67cbfb69110bff2353f95b
Merge: 00fb525 938ee9b
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Sep 30 00:46:57 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug9776                  |    5 +
 changes/geoip-september2013      |    3 +
 changes/no_client_timestamps_024 |   14 +
 doc/tor.1.txt                    |   12 +-
 src/config/geoip                 |12806 +++++++++++++++++++-------------------
 src/or/channel.c                 |    9 +-
 src/or/config.c                  |    1 +
 src/or/connection_or.c           |   33 +-
 src/or/or.h                      |    3 +
 src/or/rendclient.c              |   20 +-
 src/or/rendservice.c             |    1 +
 11 files changed, 6632 insertions(+), 6275 deletions(-)