commit afee785417cba083c4914fd9b6db49498c2eb241 parent 9320100d6eb4b3ce4f18d2b37783f92352521f15 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 9 Jul 2018 09:24:14 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump