commit 31f17cb1de0ed4c00d8115f909fa9e21e1e3458e
Merge: 87d6a14 6e96aad
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Tue Jul 5 12:25:24 2016 -0400
Merge branch 'maint-0.2.7' into release-0.2.7
Makefile.am | 2 +-
changes/bug18841.1 | 7 +
changes/bug18977 | 4 +
changes/bug19008 | 3 +
changes/bug19032 | 4 +
changes/bug19213 | 3 +
changes/geoip-jun2016 | 4 +
configure.ac | 2 +-
src/common/compat.c | 4 +
src/common/util.c | 2 +
src/config/geoip | 3349 ++++++++++++++++++++++++++++++++++--------------
src/config/geoip6 | 1366 ++++++++++++++++----
src/or/config.c | 3 -
src/or/dirserv.c | 32 +-
src/or/dirserv.h | 2 +-
src/or/networkstatus.c | 3 +-
src/test/test_util.c | 2 +-
17 files changed, 3575 insertions(+), 1217 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits