commit 1ea19d7a5bf538f5b9f0988c2375966f88d87867 parent 21c3488af714ade6f07251194165d92f77f06c31 Author: teor <teor@torproject.org> Date: Wed, 23 Oct 2019 08:24:30 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 `git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.
