commit e91b999cf2dfbb250cbf6c674ea01d7cee518092 Merge: ad10cafd9 72e30f26e Author: teor teor@torproject.org Date: Fri Mar 8 19:37:18 2019 +1000

Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes

src/or/rephist.c | 5 ++--- src/test/test_relay.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)