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

[nickm at torproject.org]

commit 65cda78ec6037da8059526d1c23449013f921ed2
Merge: a271ad2 a9f936d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:30:19 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9