commit 6e90d75061cea8a5bb09efe7c8a1cb0a7bc689d3 Merge: 5c47b92 2f6be06 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Jun 8 14:06:16 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8