commit edf5c2c3a946ff9dc3562da74b0a6e0444b24bfe Author: Karsten Loesing karsten.loesing@gmx.net Date: Tue Apr 17 14:46:04 2018 +0200

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

diff --git a/CHANGELOG.md b/CHANGELOG.md index b4efed7..199cf6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 6.0-1.13.0 - 2018-04-?? +# Changes in version 6.0-1.13.0 - 2018-04-17

* Medium changes - Change the "exit_addresses" field to not exclude current OR diff --git a/build.xml b/build.xml index 9c5ea3e..315989b 100644 --- a/build.xml +++ b/build.xml @@ -8,9 +8,9 @@

<property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="5.2"/> + <property name="onionoo.protocol.version" value="6.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.12.0-dev"/> + value="${onionoo.protocol.version}-1.13.0"/> <property name="metricslibversion" value="2.2.0"/> <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 6930d92..64e23ed 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -122,9 +122,9 @@ public class ResponseBuilder { return this.charsWritten; }

- private static final String PROTOCOL_VERSION = "5.2"; + private static final String PROTOCOL_VERSION = "6.0";

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

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