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

[nickm at torproject.org]

commit e83affb56fa001d1c27f16e30e6c23c88ff165f5
Merge: 1889405 e6376a8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:53:11 2017 -0500

    Merge branch 'maint-0.2.7' into release-0.2.7