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

[nickm at torproject.org]

commit a85fdabc60fee6db1d40129cd621c39b2772c0d1
Merge: 5cdc7a4 0f46f7d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 08:41:43 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9