Commit a225c094 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Prepare for 5.2-1.12.0 release.

parent b1077620

CERT

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

MIIDaTCCAlGgAwIBAgIEPrK+4DANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV

MIIDaTCCAlGgAwIBAgIEIk6NnzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV

UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU

b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcx

MTE3MTA0MDQ5WhcNMTgwMjE1MTA0MDQ5WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE

b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTgw

MjI2MTQwMzUzWhcNMTgwNTI3MTQwMzUzWjBlMQswCQYDVQQGEwJVUzELMAkGA1UE

CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj

dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB

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

oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX

lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud

DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAIqRy

T4uMqw1WwZ8CtJx5kSs/or+5025bGK6V2dY/jYapZcbyG7sq3KVFAqLik8Yn7a0D

dfbmtR7r2jbkWhYppa7MGSQ6SMG6nxas05l8yf9ShDnNLtJoay8JyGPeucaFyEwV

VxwN9/I4M4chrrvBzpMB/1U3oJxlKR+nssh4w55DoUijk3vHn01+20EPU9uNJrsr

mXhcrJLU/4R952ZMLxtiBfNP7vaxLpQctNqZxEfa9/rm0pLlfd2t62BWf8kkGqEy

Ke4WdNpQwk3WKjFlKWcvsF6ztJJlwA+qHk4IB9PynVRNggWimBrxWigbeBL8qpML

A5xMtX/MHDXreWGaKA==

DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAlUkU

qqf+4yfXwAWFr2q6iijr54NDDEQwybCblIzVnsuGHPUDuie3ZWSHirtblBs/uJ9x

RxmwkBrJr9IGMmGhN2GKXIPeUH0EZBYo7bsgo5d+E61OCnd/O+1JZzdG9dK+0kfq

MLfo6ltFZZouHIIXfvOm8sLLRrdkXPrLQ/E8fTHB7dL6T8Hqg6pHRrRZDtuSM9CO

zSYropxqlFzzlzciOdTU05D8Cnx2j/RtaycxHxFS7QtriDB0uOfqvyiVeqpr72wG

qetlu3h46fXj3ALGVSXy+YZpYxcRNZsQyiBXdlXbgY0OfOVPFOH3HiZuv3zhfRJW

2DiJiA8BLxZToe2XDA==

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

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line 
# Changes in version 5.1-1.12.0 - 2018-??-??

# Changes in version 5.2-1.12.0 - 2018-04-06



 * Medium changes

   - Add version_status field to details documents.

build.xml

+3 −3
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 


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

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

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

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

  <property name="release.version"

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

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

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

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

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

  <property name="warfile"

            value="onionoo-${release.version}.war"/>

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

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class ResponseBuilder { 
    return this.charsWritten;

  }



  private static final String PROTOCOL_VERSION = "5.1";

  private static final String PROTOCOL_VERSION = "5.2";



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