commit 2f6be06f6a0a563bc07c089bf498b1d3792ae01f parent 44c8cb986d8a95e3eaf8e3ec40307a7d7bb65197 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 8 Jun 2017 14:06:06 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux "ours" merge to avoid version bump.