commit a427a7c479d633ad74819729eb2412c5c5e9e97e Merge: 4c90cdc 60b8aae Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 13 14:21:47 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug19213 | 2 +- changes/geoip-jun2016 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)