commit df70c44960aec3abc617b4d395bf5443c543cedc parent 50626479183858d25d4e52b80b000dbb43097917 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 21 Feb 2019 13:23:22 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" to avoid version bump