commit 1b4075cb272a6f9a14cd0e0b8c73d359666fc479 parent 8af8ecabbe429503a4ff9d5510df610907c6e45a Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 15 Nov 2018 17:08:04 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid taking 25573 and 27686 again.