commit f7b06202c787d117eb22f04798a6f3f4b6722af1 parent 3c6d4fe04670875497dd451109d1bc16da7b7aae Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 14 Sep 2017 13:21:28 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.