commit 35d945a646b3384640d3863aec07d873179efffd parent 15f6201a5b7249451608653040241b8f33a16db0 Author: Nick Mathewson <nickm@torproject.org> Date: Sat, 3 Mar 2018 11:33:33 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" merge to avoid version bump.