Merge branch 'master' into develop
Add newline after `flag-thresholds` line in networkstatuses.

 * FIXES #12953 https://bugs.torproject.org/12953
Merge branch 'fix/12953' into develop
Better documentation for leekspin.netstatus.generateNetstatus().
Rename generateNetstatus() → generateBridgeNetstatus().
Merge branch 'release-0.2.1'