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

[nickm at torproject.org]

commit a1c3b391de98e73528d042a8b4c9d804b6d5bf57
Merge: 5d88267 5222054
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:52:54 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9