git diff is not very helpful for single-line files, so here's what
changed:

< Bolivia, Plurinational State of:BO
> Bolivia:BO

< Brunei Darussalam:BN
> Brunei:BN

< Holy See (Vatican City State):VA
> Vatican City:VA

< Iran, Islamic Republic of:IR
> Iran:IR

< Korea, Democratic People's Republic of:KP
> North Korea:KP

< Lao People's Democratic Republic:LA
> Laos:LA

< Macao:MO
> Macau:MO

< Macedonia, the former Yugoslav Republic of:MK
> Macedonia:MK

< Myanmar:MM
> Burma:MM

< Palestinian Territory, Occupied:PS
> Palestinian Territory:PS

< Pitcairn:PN
> Pitcairn Islands:PN

< Russian Federation:RU
> Russia:RU

< Saint Helena, Ascension and Tristan da Cunha:SH
> Saint Helena:SH

< Saint Barthélemy:BL
> Saint Bartelemey:BL

< Saint Martin (French part):MF
> Saint Martin:MF

< Suritext:SR
> Suriname:SR

< Taiwan, Province of China:TW
> Taiwan:TW

< Timor-Leste:TL
> East Timor:TL

< Venezuela, Bolivarian Republic of:VE
> Venezuela:VE

< Viet Nam:VN
> Vietnam:VN

The following names have not been changed, because they were mainly about
formatting or because there was no equivalent in either country list:

< Åland Islands:AX
> Aland Islands:AX

< Bonaire, Sint Eustatius and Saba:BQ

> Congo, The Democratic Republic of the:CD
< Congo, the Democratic Republic of the:CD

< Côte d'Ivoire:CI
> C&#244;te d'Ivoire:CI

< Curaçao:CW

> France, Metropolitan:FX

> Netherlands Antilles:AN

< Réunion:RE
> Reunion:RE

< Sao Tome and Principe:ST
> S&#227;o Tom&#233; and Pr&#237;ncipe:ST

< Sint Maarten (Dutch part):SX

- Tell app.py about the new --by-network-family option.  If app.py doesn't
  know about it, compass.py will be surprised that it's not there.
- Fix last table row saying how many other groups are not displayed by
  just saying how many "relay groups" there are.

We need it to scale for more than two grouping options

Onionoo protocol specification guarantee that the first entry in or_addreses is
always the primary IP address.

Based on a patch by Lunar <lunar@torproject.org>.  Fixes #8931.