commit 4d4eda89a1d0f3b19b408349d602bf7ba47e1cdb Merge: 6927e9a60 ccab4347e Author: Roger Dingledine <arma@torproject.org> Date: Wed Feb 20 10:36:54 2019 -0500 Merge branch 'maint-0.4.0' changes/ticket28614 | 2 +- changes/ticket29072 | 2 ++ contrib/or-tools/check-tor | 41 ------------------------------------ src/feature/nodelist/networkstatus.c | 2 +- src/test/test_util.c | 2 +- 5 files changed, 5 insertions(+), 44 deletions(-)