commit d11976b8bd4bded2939ff973d7b2beb36c201bf0 Merge: 2790ee368 6c652eae0 Author: George Kadianakis <desnacked@riseup.net> Date: Tue Mar 26 15:34:54 2019 +0200 Merge branch 'tor-github/pr/709' changes/bug29018 | 5 + doc/tor.1.txt | 5 +- src/feature/nodelist/torcert.c | 4 +- src/feature/nodelist/torcert.h | 2 +- src/feature/relay/router.c | 375 ++++++++++--- src/feature/relay/router.h | 23 +- src/feature/relay/routerkeys.c | 16 +- src/feature/relay/routerkeys.h | 4 +- src/test/test_dir.c | 1203 +++++++++++++++++++++++++++++++--------- src/test/test_router.c | 3 + 10 files changed, 1276 insertions(+), 364 deletions(-)