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

[nickm at torproject.org]

commit 946661d1dba09dda7af65a2cec8246be43299709
Merge: 0f46f7d 93ea18e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 08:55:35 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9