commit 54e6109499c2ba11ef9c99073bee449c61ebc080 Merge: df16376004 62667b49e9 Author: George Kadianakis desnacked@riseup.net Date: Fri Oct 30 14:14:14 2020 +0200

Merge remote-tracking branch 'tor-gitlab/mr/174' into master

changes/ticket40132 | 4 + scripts/codegen/makedesc.py | 115 +- src/feature/dirparse/microdesc_parse.c | 2 +- src/feature/dirparse/ns_parse.c | 2 +- src/feature/dirparse/routerparse.c | 18 +- src/feature/dirparse/sigcommon.c | 6 +- src/feature/dirparse/sigcommon.h | 12 +- src/test/ed25519_exts_ref.py | 6 +- src/test/example_extrainfo.inc | 505 ++++----- src/test/example_extrainfo.template | 182 ++++ src/test/failing_routerdescs.inc | 1840 ++++++++++++++++---------------- src/test/failing_routerdescs.template | 812 ++++++++++++++ src/test/slow_ed25519.py | 25 +- src/test/test_descriptors.inc | 734 +++++++------ src/test/test_dir.c | 460 +++----- src/test/test_dir_common.c | 4 + src/test/test_dir_handle_get.c | 49 +- src/test/test_microdesc.c | 185 ++-- src/test/test_router.c | 92 +- src/test/test_routerlist.c | 4 +- src/test/vote_descriptors.inc | 8 +- 21 files changed, 2984 insertions(+), 2081 deletions(-)