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

[nickm at torproject.org]

commit caa16bffc75b8e36ae3f834c52e9b107513e263f
Merge: a8b607b 1edea87
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 22 09:00:23 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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