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

[nickm at torproject.org]

commit 92891ded3016dd7cabb34b401ff964e325bd7d1d
Merge: c28ba99 19078b1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 13:51:51 2016 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

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