commit 8d5ad8cd34a7755d025ec4a50879acea5ded7ddc parent a5c9ae8526f179e588dc9de73a5c89ffaca70ad8 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 18 Dec 2018 08:09:53 -0500 Merge branch 'maint-0.3.5' Used "git merge -s ours" to avoid taking the revert of 28731.