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

[arma@xxxxxxxxxxxxxx]

commit a1963695cada32e3728f44ad585a7453ec7ffe3b
Merge: 00ca2cc a5610cf
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Sat Aug 31 20:10:58 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug9366                |    4 +
 changes/bug9543                |    4 +
 changes/bug9546                |   11 +
 changes/bug9564                |    5 +
 changes/doc-heartbeat-loglevel |    3 +
 changes/geoip-august2013       |    3 +
 doc/tor.1.txt                  |    2 +-
 src/config/geoip               | 9207 ++++++++++++++++++++--------------------
 src/or/channeltls.c            |   14 +-
 src/or/config.c                |   17 +
 src/or/connection_or.c         |    9 +-
 src/or/networkstatus.c         |    2 +-
 src/or/or.h                    |    3 +
 13 files changed, 4590 insertions(+), 4694 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits