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

[nickm at torproject.org]

commit 99683ee561e065c4350e713eec3d2d8cd67325dd
Merge: 5032489 30f0516
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 5 10:07:04 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9