commit 4f1711dca9aa119e7220f33b25f1ed3efa57003d Author: Karsten Loesing karsten.loesing@gmx.net Date: Tue Jun 10 17:41:30 2014 +0200

Clarify ntor-onion-key lines and @type versions.

In b65f0a1, we included ntor-onion-key lines in sanitized bridge server descriptors but raised the @type version number of sanitized bridge extra-infos. Too late to fix that, but let's document this.

Spotted by Isis. --- web/formats.html | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/web/formats.html b/web/formats.html index 68fddee..9499235 100644 --- a/web/formats.html +++ b/web/formats.html @@ -311,6 +311,14 @@ contain all descriptors collected in an hour concatenated into a single file to reduce the number of files. </p>

+<p> +There was supposed to be a newer version of this document that indicates +added <tt>ntor-onion-key</tt> lines, but due to a mistake only the version +number of sanitized bridge extra-info descriptors was raised. +As a result, there may be sanitzed bridge server descriptors with and +without those lines. +</p> + <h3>Extra-info descriptors (<a href="archive/bridge-descriptors/">archive</a>, <a href="recent/bridge-descriptors/extra-infos/">recent</a>) @@ -318,7 +326,7 @@ file to reduce the number of files. </h3>

<p> -Bridge server descriptors follow the same format as relay server +Bridge extra-info descriptors follow the same format as relay extra-info descriptors, except for the sanitizing steps described above. The format has changed over time to accomodate changes to the sanitizing process, with earlier versions being: @@ -329,8 +337,10 @@ process, with earlier versions being: version.</font></li> <li><font color="#666"><tt>@type bridge-extra-info 1.1</tt> added sanitized <tt>transport</tt> lines</font>.</li> -<li><tt>@type bridge-extra-info 1.2</tt> added <tt>ntor-onion-key</tt> -lines.</li> +<li><tt>@type bridge-extra-info 1.2</tt> was supposed to indicate added +<tt>ntor-onion-key</tt> lines, but those changes only affect bridge server +descriptors, not extra-info descriptors. +So, nothing has changed as compared to version 1.1.</li> </ul>

<p>