commit 5e2f31f177d106388021f18c9077b656bf494fec
Merge: 3aa855dc6 2962c32b7
Author: teor <t...@torproject.org>
Date: Sat Mar 21 03:52:32 2020 +1000
Merge branch 'bug32588_041' into bug32588_042
changes/bug32588 | 4 ++
src/app/config/config.c | 5 +-
src/app/config/config.h | 4 ++
src/feature/relay/router.c | 77 ++++++++++++++++++-----------
src/feature/relay/router.h | 2 +
src/test/test_config.c | 66 +++++++++++++++++++++++++
src/test/test_router.c | 117 +++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 243 insertions(+), 32 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
