commit 6b9c2ac23e7dfbaeaefc1fd5923645850668e7af parent ee48eb1eb5e643cd8af2a32df3cf8c48965f6ce4 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 30 Nov 2017 12:25:07 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" to avoid version bump.