Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
commite91b999cf2dfbb250cbf6c674ea01d7cee518092
authorteor <teor@torproject.org>
Fri, 8 Mar 2019 09:37:18 +0000 (8 19:37 +1000)
committerteor <teor@torproject.org>
Fri, 8 Mar 2019 09:37:18 +0000 (8 19:37 +1000)
tree10a32ea7b53341af913ed7989dfe6a4a0ec9d2f8
parentad10cafd9f0157e6aaa6f1f68ab7d3ef9b8b1b2e
parent72e30f26ec291baba202b71e121c3211af2db371
Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
src/or/rephist.c
src/test/test_relay.c