commit 1f6b918466100c019114eada95f3ff9610256953 Merge: 6ba5480 c7b0cd9 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 7 09:47:57 2016 -0800

Merge branch 'maint-0.2.6' into release-0.2.6

changes/bug17354 | 4 + changes/bug17772 | 7 + changes/bug17781 | 3 + changes/bug17906 | 4 + changes/geoip-december2015 | 4 + changes/geoip-january2016 | 4 + changes/geoip-october2015 | 3 + src/config/geoip |13046 +++++++++++++++++++++++++++++++------------- src/config/geoip6 | 3780 +++++++++++-- src/or/config.c | 2 +- src/or/main.c | 1 + src/or/routerlist.c | 10 +- 12 files changed, 12399 insertions(+), 4469 deletions(-)