commit e468498469ebb2a676e74884a34fa017fa8ac3a4 parent 348b225bd86afa77180b72d33d8bf6025dd8f6ac Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 14 Sep 2017 13:21:52 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump.