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