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

[nickm at torproject.org]

commit f7ed4a7d8f489aeb31246e4b75c30b40bbf94fa6
Merge: 6e7ff9e aeb299b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:52:33 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.6