Signed-off-by: David Goulet <dgoulet@torproject.org>

Conflicts:
  src/test/test.c

  Minor comment issue.

Fixes #40356

Signed-off-by: David Goulet <dgoulet@torproject.org>

David Goulet authored Mar 25, 2021 and Nick Mathewson committed Apr 19, 2021

Signed-off-by: David Goulet <dgoulet@torproject.org>

emery authored Apr 16, 2021 and Nick Mathewson committed Apr 19, 2021

Using a custom ar at $AR may be necessary for cross-compilation.

Closes #40369

Signed-off-by: David Goulet <dgoulet@torproject.org>

"ours" to avoid version bump.

The --include-asn option includes AS numbers in the geoip mapping.

The --output-asn option makes the program generate a number-to-name
mapping file.

Additionally, the script now outputs ?? CC entries for networks that
are listed but which have no country known.

Signed-off-by: David Goulet <dgoulet@torproject.org>

This is a bugfix against my fix for #40133, which has not yet
appeared in 0.3.5.