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

[nickm at torproject.org]

commit 19078b1b89ff7db5ceb917d34b2d152f73027334
Merge: 9d3de77 6b8c3d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 13:51:34 2016 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

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