commit 8af8ecabbe429503a4ff9d5510df610907c6e45a parent c0e18d2f899b32c2c25429e7991e28d5c59ee4ef Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 15 Nov 2018 16:55:42 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid duplicating conflict resolution in merge of 24104
