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

[nickm at torproject.org]

commit cb2e2056b5637443715bf494be72d0953c75b4be
Merge: 7f55aaf 2673b4b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:23:35 2016 -0500

    Merge branch 'maint-0.2.7' into maint-0.2.8