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

[nickm at torproject.org]

commit 121105735c36fc1d32835c61b4fa47cb705f80e1
Merge: d0d9afa 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 release-0.2.7-redux