[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

[nickm at torproject.org]

commit e6376a8004072fde832da77aa6369075dcdcbe8b
Merge: 67877f5 f7ed4a7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:52:41 2017 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7