[tor-commits] [onionoo/release] Prepare for 5.0-1.9.0 release.

[karsten@xxxxxxxxxxxxxx]

commit 0bce98a8177c78e1c14d27bb53e9ec359d1547bf
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Wed Dec 20 10:02:15 2017 +0100

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 067d5bb..8dad79f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Changes in version 5.0-1.9.0 - 2017-12-20
+
+ * Medium changes
+   - Remove the $ from fingerprints in fields "alleged_family",
+     "effective_family", and "indirect_family".
+
+
 # Changes in version 4.4-1.8.0 - 2017-11-28
 
  * Medium changes
diff --git a/build.xml b/build.xml
index 01760c8..d2db15d 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.4"/>
+  <property name="onionoo.protocol.version" value="5.0"/>
   <property name="release.version"
-            value="${onionoo.protocol.version}-1.8.0-dev"/>
+            value="${onionoo.protocol.version}-1.9.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 160b681..9b2b442 100644
--- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
+++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
@@ -123,9 +123,9 @@ public class ResponseBuilder {
     return this.charsWritten;
   }
 
-  private static final String PROTOCOL_VERSION = "4.4";
+  private static final String PROTOCOL_VERSION = "5.0";
 
-  private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2017-12-17";
+  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);

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits