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