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

[arma@xxxxxxxxxxxxxx]

commit c0411e1c892842f9de1c21ca2a5ede58c7b9649d
Merge: d14fcdc a57c07b
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Thu Jul 24 16:31:09 2014 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bufferevent_compilation             |    6 +
 changes/bug12602                            |    5 +
 changes/bug8387                             |   11 +
 changes/curve25519-donna32-bug              |   12 +
 changes/further-12184-diagnostic            |    2 +
 changes/geoip-july2014                      |    3 +
 changes/geoip6-july2014                     |    2 +
 changes/ticket12688                         |    6 +
 changes/ticket12690                         |    9 +
 configure.ac                                |    2 +-
 doc/tor.1.txt                               |    8 +-
 src/common/tortls.c                         |    2 +
 src/config/geoip                            | 3600 ++++++++++++++++++--------
 src/config/geoip6                           | 3674 +++++++--------------------
 src/ext/curve25519_donna/curve25519-donna.c |  292 ++-
 src/or/channel.c                            |    7 +-
 src/or/circuitbuild.c                       |    2 +
 src/or/circuituse.c                         |   36 +-
 src/or/circuituse.h                         |    1 +
 src/or/config.c                             |    7 +-
 src/or/connection.c                         |   60 +-
 src/or/dirserv.c                            |    5 +-
 src/or/entrynodes.c                         |   20 +-
 src/or/main.c                               |    5 +-
 src/test/test_oom.c                         |   13 +-
 25 files changed, 3819 insertions(+), 3971 deletions(-)

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