commit bff08ed8eb4f9c36d32ae5e15bd574052cca8d78 parent 792931d53d26e469ea2e22f63911b1553c053473 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 8 Jun 2017 09:29:05 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 "ours" merge to avoid version bump.