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

[nickm at torproject.org]

commit 0e2f18868cc7634cf4ef8bc7823f61cd301497ba
Merge: fd6ba23 6b8c3d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 13:51:28 2016 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

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