commit bce585f4a5dfe0fa795e67efd02b37c95925b613 Author: Karsten Loesing karsten.loesing@gmx.net Date: Mon Oct 9 17:05:57 2017 +0200

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

diff --git a/CHANGELOG.md b/CHANGELOG.md index b7b379c..b2aff31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 4.?-?.?.? - 2017-??-?? +# Changes in version 4.2-1.6.0 - 2017-10-09

* Medium changes - Only set the "running" field in a bridge's details document to diff --git a/build.xml b/build.xml index 72f3ecc..ee3c0da 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="4.1"/> + <property name="onionoo.protocol.version" value="4.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.5.0-dev"/> + value="${onionoo.protocol.version}-1.6.0"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/build b/src/build index a64b94a..4b34756 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit a64b94a635e5396266d5c5b5cf88850b9f4b6a24 +Subproject commit 4b34756ddd71ccaf0fc30e5f5bf0a813a297d4a3 diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 6b6b8ee..c0b2772 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -123,7 +123,7 @@ public class ResponseBuilder { return this.charsWritten; }

- private static final String PROTOCOL_VERSION = "4.1"; + private static final String PROTOCOL_VERSION = "4.2";

private static final String NEXT_MAJOR_VERSION_SCHEDULED = null;