commit dfdd877647ef496b2b4a82e8c1e6040692ecebb5 parent 48e990359b05661f2dd0ae503143ee9b18442475 Author: teor <teor@torproject.org> Date: Wed, 17 Apr 2019 11:51:32 +1000 Merge branch 'bug30184_029' into bug30184_034 "ours" merge, because 0.3.4 has a different set of changes, which already compile.
