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

[nickm at torproject.org]

commit 7e47709faa3fa29b0df6e268b38a33ef583c04cf
Merge: 1992ed6 7c25b41
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 13:52:23 2016 -0400

    Merge branch 'maint-0.2.7' into release-0.2.8

 changes/19271 | 2 ++
 1 file changed, 2 insertions(+)