[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit 6ea9d3fd42d6fa38f1a43fb0c5016c03d1eabd8b
Merge: 5c97b42 717eae3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:58:28 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug19499 | 2 +-
 changes/bug19556 | 2 +-
 changes/bug19557 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)