commit c78904b6302c53e0778854974c13aa4d5a499bb0 parent 6851a08090325dc51b26e80350395c4a0c778cf8 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 24 Oct 2018 12:57:14 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid taking a second instance of 27797.