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

[nickm at torproject.org]

commit 35f449c8b92b5904b221da7e1ed145910dbe5819
Merge: 563b8d9 a1c3b39
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:53:15 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9