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

[nickm at torproject.org]

commit 9a6f93858267ba2d68f1f092498a06f5115126c4
Merge: 3f2d1f7 a56cfda
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 14:48:30 2017 -0400

    Merge branch 'maint-0.2.6' into maint-0.2.7-redux