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

[nickm at torproject.org]

commit 59403f5cd8868d5b0ee8f271afa02662cbd83681
Merge: a85fdab 946661d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 08:56:49 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9