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

commit 876032555030d9a443a343261cbf97a10319cf19 Merge: ef87106 60b8aae Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 13 13:57:09 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug19213 | 2 +- changes/geoip-jun2016 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)