commit b796ad0300d1b023bc38e5a1498b47bc2e680eae parent 0de46203750f8c01b5f355d743949fe8471b0636 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 8 Jun 2017 09:28:29 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 "ours" merge to avoid version bump.