commit d51595ec573df21cc96ee71fbb466d6a4e30ae1c parent 85c5f58509898bf8236ccb8998556f1ab688cb05 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 7 Jan 2019 10:22:47 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump.