commit 4915d9c5a7fc8db2497258a293137426cbd0d665 parent 2efe0275bcdbbdf37d1d8ef59a8ec4df9f5fca59 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 8 Jun 2017 09:28:54 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux "ours" merge to avoid version bump.