commit 7c2f688fb9b73c2aba6df9bd8792487e8d96cecc parent f68c1b14067e0f9b0747be2cfe77a25b81b33616 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 25 Oct 2017 09:28:49 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump
