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

[nickm at torproject.org]

commit 4f1fcaa27be7df293a10f820728a81adc702a8c3
Merge: 1ed6cb0 65cda78
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:30:38 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9