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

[nickm at torproject.org]

commit 28e42f6fff17e9440f6c3efb8817bd46f529fceb
Merge: f84a5e8 92891de
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 13:51:59 2016 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

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