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

[nickm@xxxxxxxxxxxxxx]

commit b2a53e8ca910391a10451860a1aaf66b3c207f50
Merge: e0fa07c c6a3375
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Thu Dec 10 04:12:10 2015 -0500

    Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug16056           |    4 +
 changes/bug16702           |    4 +
 changes/bug17551           |    4 +
 changes/bug17722           |    3 +
 changes/bug17772           |    7 +
 changes/bug17781           |    3 +
 changes/geoip-december2015 |    4 +
 configure.ac               |    3 +
 src/config/geoip           | 4547 ++++++++++++++++++++++++++++++++------------
 src/config/geoip6          | 2580 +++++++++++++++++++++----
 src/or/policies.c          |    6 +-
 src/or/rendservice.c       |    3 +-
 src/or/routerlist.c        |   10 +-
 src/or/torcert.c           |    6 +-
 14 files changed, 5558 insertions(+), 1626 deletions(-)



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