[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

[nickm at torproject.org]

commit 407441c6529a5537ac759e6f5180b506df61440f
Merge: 9ccf019 26c344a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 13 11:05:05 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

 changes/bug15850         |    4 +
 changes/geoip-april2015  |    3 +
 changes/geoip6-april2015 |    2 +
 src/config/geoip         |10061 ++++++++++++++++------------------------------
 src/config/geoip6        | 1268 ++++--
 src/or/dirserv.c         |    2 +-
 6 files changed, 4470 insertions(+), 6870 deletions(-)