Commit 8b260b19 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Prepare for 7.0-1.18.0 release.

parent ab719908

CERT

+9 −9
Original line number Diff line number Diff line 
-----BEGIN CERTIFICATE-----

MIIDaTCCAlGgAwIBAgIENNGkczANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV

MIIDaTCCAlGgAwIBAgIELle0dTANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV

UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU

b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTgw

NTIzMTUxNDU2WhcNMTgwODIxMTUxNDU2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE

ODI4MDcwNjM2WhcNMTgxMTI2MDcwNjM2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE

CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj

dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB

AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU
@@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE 
MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD

oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX

lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud

DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAJtEQ

B2AVpVtjTGU7uujUtEjSn1ICv7QLW/37TmHn+m1SWvXOVlSG81eb5JwX449Pn3w5

K1Bx0JJmJ6Kec2kHtoR1r5/DUlTMtRqKQ5ZHQbvYMx+Ifq8TRALHjcw8p5Vw+gep

0zYbSQycklzFaFqLB8Cus0ICb+UY54HTddpezQ3IXS/vc4Vy07ocm8rUCz1s8L/r

ehTOxSym7G7+kcRzNplFOLL5iO8o6uHPyLR1TIAIXa0XZ41ogNl2q+6CvXG+UI/j

qkzSXD6FJK1Px2nxNFIe/w9NL+chSytIGnV3CImyiORuV+1OxMglyQspSGEbl1XP

OfiTEYHnp12BYMeRyw==

DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAkXZs

3T3GTkZ+EGvZG5puzKdgZiSsLgIy25xdWsIx147AIZEJFKjEAtbu0osMpkTa96B6

a+BHf7PTjQUuH3YOEmeW9ab8pwu5SRijCq2qkuvjjSLBcJzWnalcKDYYvoQte1//

Di8JqpRXCw20WY2bldTiafyG80E0RGfiX2I8vbDiPIhjwz9Wox8Q1rw1c9T/vRn9

pI8FrHgTnDO6R54yD25QSpsj+hC+IDkFKO17vGCIaJrPG5o6th438ijEwJsG+LRB

4zKKKsFTby7UJI3Ag8xolIhsBkRZO2j4Na35i15SZ7QJNj9J5g171z8RyOmyIQbg

q7OXN2iiRIxiIJwoQw==

-----END CERTIFICATE-----

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line 
# Changes in version 7.0-1.18.0 - 2018-09-??

# Changes in version 7.0-1.18.0 - 2018-09-10



 * Medium changes

   - Extend "version" parameter to support lists and ranges.

build.xml

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 


  <property name="javadoc-title" value="Onionoo API Documentation"/>

  <property name="implementation-title" value="Onionoo" />

  <property name="onionoo.protocol.version" value="6.2"/>

  <property name="onionoo.protocol.version" value="7.0"/>

  <property name="release.version"

            value="${onionoo.protocol.version}-1.17.1-dev"/>

            value="${onionoo.protocol.version}-1.18.0"/>

  <property name="metricslibversion" value="2.4.0"/>

  <property name="jetty.version" value="-9.2.21.v20170120" />

  <property name="warfile"

src/main/java/org/torproject/onionoo/server/ResponseBuilder.java

+2 −2
Original line number Diff line number Diff line
@@ -123,9 +123,9 @@ public class ResponseBuilder { 
    return this.charsWritten;

  }



  private static final String PROTOCOL_VERSION = "6.2";

  private static final String PROTOCOL_VERSION = "7.0";



  private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2018-09-03";

  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);