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

[nickm at torproject.org]

commit 8fda6b260e7ef1f96e6134068159e863afbaa3d6
Merge: 59403f5 3e5b1c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:21:20 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9