commit 6deeedb5e09fc0998ab5d4e2fc53415bc6dc5c39 Merge: 4c69ba5 1edea87 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 22 09:00:37 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug20103 | 2 +- changes/geoip-september2016 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)