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

[nickm at torproject.org]

commit d850d27369020706769e9e8a0d5fec621a5deb8a
Merge: 33fcc0f 9a6f938
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 14:48:30 2017 -0400

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