commit 8cfca28be28f36eec93195f8818ab7adc20426d1 parent cff7cb858b2dfaacb0138bbe4637a80b58147f6a Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 10 Sep 2018 09:41:55 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" to avoid version bump.