commit d389480da54dfff4900b5ddf8c0795a02672bafe parent a0664fd0c32139e5fded325dd6df6a8b636a72ba Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 8 Jun 2017 09:29:23 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump.