commit dd0ee016e9e386410c374d0dd421f5683ec8476e parent 28f453c4764962394bf0cd3a314b2b60af7ee1b4 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 6 May 2020 16:51:33 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.