commit 7fae562a4da62090817f8546e8f4a8a29dcf1c4a parent a12dbbd882a10d23e5a9cdec451145ca48c06080 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 1 Dec 2017 09:35:25 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.