commit 88ca11145535220973ce3bcfc54c62c1288b781d Author: Karsten Loesing karsten.loesing@gmx.net Date: Tue Mar 13 17:45:35 2018 +0100

Prepare for 5.1-1.11.0 release. --- CHANGELOG.md | 3 ++- build.xml | 2 +- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md index c95dacf..6fe389b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 5.1-1.??.? - 2018-??-?? +# Changes in version 5.1-1.11.0 - 2018-03-14

* Medium changes - Stop omitting "n" in summary docs for "Unnamed" relays/bridges. @@ -8,6 +8,7 @@ - Make responses deterministic by always sorting results by fingerprint, either if no specific order was requested or to break ties after ordering results as requested. + - Announce next major protocol version update on April 14, 2018.

# Changes in version 5.0-1.10.1 - 2018-02-07 diff --git a/build.xml b/build.xml index 47516ca..c7b0b98 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="5.1"/> <property name="release.version" - value="${onionoo.protocol.version}-1.10.1-dev"/> + value="${onionoo.protocol.version}-1.11.0"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 1e92469..bb36a2c 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -125,7 +125,7 @@ public class ResponseBuilder {

private static final String PROTOCOL_VERSION = "5.1";

- private static final String NEXT_MAJOR_VERSION_SCHEDULED = null; + private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2018-04-14";

private void writeRelays(List<SummaryDocument> relays, PrintWriter pw) { this.write(pw, "{"version":"%s",\n", PROTOCOL_VERSION);