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

[nickm at torproject.org]

commit f55b5085a565ed15f05be6b12f61cef62657bfe9
Merge: f2270bf a9bfa99
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:16:06 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9