[tor-commits] [tor/master] Merge branch 'maint-0.2.9'
nickm at torproject.org
nickm at torproject.org
Mon Nov 7 14:32:39 UTC 2016
commit 800dff13080111b1ce1c2f5e28d9ba326299f62a
Merge: a415fee e4b793f
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Nov 7 09:32:21 2016 -0500
Merge branch 'maint-0.2.9'
changes/bug20533 | 7 +
changes/bug20534 | 6 +
changes/bug20536 | 6 +
changes/bug20587 | 6 +
changes/bug20591 | 3 +
changes/geoip-november2016 | 4 +
src/config/geoip | 4025 ++++++++++++++++++++++++++++----------------
src/config/geoip6 | 2490 ++++++++++-----------------
src/or/directory.c | 11 +-
src/or/directory.h | 12 +-
src/or/networkstatus.c | 19 +-
11 files changed, 3465 insertions(+), 3124 deletions(-)
More information about the tor-commits
mailing list