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

[nickm at torproject.org]

commit 86987653a236f6f0ce8b87bd572a68f57e182ba8
Merge: f55b508 490cd03
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:24:00 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9