commit d8196dc200b9a21af53313999551c7c081a5c8f4 parent 3d18903f53081cc31bd74d10632d1319ed5eba48 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 7 Jan 2019 10:22:13 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump.