Merge branch 'bug24104_029_squashed'
commit94b04d6c64ec998a9117d65a156888fa3af188e5
authorNick Mathewson <nickm@torproject.org>
Tue, 4 Sep 2018 14:44:36 +0000 (4 10:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 4 Sep 2018 14:44:36 +0000 (4 10:44 -0400)
tree08ed94f695e8c1b9abef413a8bfee98c8be07be8
parent1c62adb65baa99c92f937318c452955306301643
parent81f4223329a709e5138532b037a58c118b30dd7f
Merge branch 'bug24104_029_squashed'
src/feature/relay/router.c
src/feature/stats/rephist.c
src/feature/stats/rephist.h
src/test/log_test_helpers.c
src/test/log_test_helpers.h
src/test/test_router.c