commit ddfb87724265f5926abd2469d9f7cbc3893e71a8 parent 90758b2606ce490e8f95ec4d59c819fb0b5a952e Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 8 Jun 2017 14:06:41 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump.