[tor-commits] [onionoo/master] Prepare for 4.1-1.4.0 release.

[karsten@xxxxxxxxxxxxxx]

commit b3bb600f3495603ea4f13e94d9b99556c0be9dc0
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Wed Aug 30 22:35:48 2017 +0200

    Prepare for 4.1-1.4.0 release.
---
 CERT                                                   | 18 +++++++++---------
 CHANGELOG.md                                           |  6 +++---
 build.xml                                              |  2 +-
 .../org/torproject/onionoo/server/ResponseBuilder.java |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CERT b/CERT
index 6cc5a93..d94c0c3 100644
--- a/CERT
+++ b/CERT
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIDaTCCAlGgAwIBAgIEYQnM/zANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
+MIIDaTCCAlGgAwIBAgIEZTniETANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
 UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU
 b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcw
-MTAyMTYzNTQ2WhcNMTcwNDAyMTYzNTQ2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE
+ODE3MTg1MDQ0WhcNMTcxMTE1MTg1MDQ0WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE
 CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj
 dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU
@@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE
 MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD
 oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX
 lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud
-DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAi2K5
-o3UnRBLdk9zkBEDbqPWxq8eiiIacbSoorspVlv4vqNO2UsTLc2sA4zZpY1L7Mkc6
-y7pcd1jFc6e9Wzt0agoIU9i3pyqkUx11ktE8a8CiVjDOns05GHe1DsLYcSLG8aJR
-2pNEFjZEndHTXGRKwxtTmHimsIIWiy8tYFkC7SkBQj+BnXBqzCbJPhRDpMdhyJmQ
-CLUhTTgU30G32x3vOhddWHAH8UDsXNlBASQOFs+A/1Mx5DI5AXLtwjp/rweTWoBk
-11SfkVS/mfMZNRGOA9DEfoRYHPT0Rn4URAQrBr73CKQaVVYyeuDOoEs69KRH2JSO
-IRcgAfpjtg8cry/eiw==
+DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAbsAc
+gwl5KJH3pVKw4b+ACCOMgW+27MisCFbT1Izq2Wx+JcLMt3N//MoIpYOZWhsIeazW
+/NE0fNbkLi0IYA0F1nUC9pHl44Hd8Gjfqa/YQUi9ALtgsY7l6W0sceW8WnZ8bu8J
+DfrqnmB0bD2xc9ZjOn58al8dVjVWs95M87D9WCRU6LiaKFj5c45wciABQsTmC0qD
+pyHYOaSGtXxXKDw5pAntdtHkCbowV5tDi/QQ8Tg7i5O7xwSh71Q7TZiNFMpLomBL
+QllHfTZryFmoHyGn5MfngBUVCVHig5nXmk0dUMGuLiK4789dkgiPRz0vpB5Yf8Yy
+CCE2jB6VBi2g5fMx0w==
 -----END CERTIFICATE-----
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9538287..20ddb1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 4.1-1.?.? - 2017-0?-??
+# Changes in version 4.1-1.4.0 - 2017-08-30
 
  * Medium changes
    - Reset IPv6 exit-policy summary in details status if a newer
@@ -6,10 +6,10 @@
    - Remove optional fields "countries", "transports", and "versions"
      from clients objects which were still labeled as beta.
    - Add new "version" parameter to filter for Tor version.
-   - Switch from our own CollecTor downloader to metrics-lib's
-     DescriptorCollector.
 
  * Minor changes
+   - Switch from our own CollecTor downloader to metrics-lib's
+     DescriptorCollector.
    - Add a new Java property "onionoo.basedir" to re-configure the
      base directory used by the web server component.
 
diff --git a/build.xml b/build.xml
index 24010dd..41f11c0 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
   <property name="implementation-title" value="Onionoo" />
   <property name="onionoo.protocol.version" value="4.1"/>
   <property name="release.version"
-            value="${onionoo.protocol.version}-1.3.0-dev"/>
+            value="${onionoo.protocol.version}-1.4.0"/>
   <property name="metricslibversion" value="2.0.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 c9cec32..efa02c3 100644
--- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
+++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
@@ -102,7 +102,7 @@ public class ResponseBuilder {
     return this.charsWritten;
   }
 
-  private static final String PROTOCOL_VERSION = "4.0";
+  private static final String PROTOCOL_VERSION = "4.1";
 
   private static final String NEXT_MAJOR_VERSION_SCHEDULED = null;
 

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