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

[nickm at torproject.org]

commit 9ead4e926fb44f6e9e5c6a6cf599f624c1f7a802
Merge: fe0bfbf f602172
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 7 18:28:39 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9