[tor-commits] [onionoo/master] Update to protocol version 2.2.

[karsten at torproject.org]

commit f44f08918649b5e0bbc6f56ba1369ff594489b9a
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Tue Dec 2 11:40:00 2014 +0100

    Update to protocol version 2.2.
    
    Related to #11052.
---
 build.xml                                                        |    2 +-
 src/main/java/org/torproject/onionoo/server/ResponseBuilder.java |    2 +-
 web/protocol.html                                                |    3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 9aa5fd5..fbb3837 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <project default="dist" name="onionoo" basedir=".">
 
-  <property name="onionoo.protocol.version" value="2.1"/>
+  <property name="onionoo.protocol.version" value="2.2"/>
   <property name="release.version"
             value="${onionoo.protocol.version}.0"/>
   <property name="javasources" value="src/main/java"/>
diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
index fc22a7c..371b79f 100644
--- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
+++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
@@ -69,7 +69,7 @@ public class ResponseBuilder {
     return this.charsWritten;
   }
 
-  private static final String PROTOCOL_VERSION = "2.1";
+  private static final String PROTOCOL_VERSION = "2.2";
 
   private static final String NEXT_MAJOR_VERSION_SCHEDULED = null;
 
diff --git a/web/protocol.html b/web/protocol.html
index 5f3b85f..f19d0d8 100644
--- a/web/protocol.html
+++ b/web/protocol.html
@@ -171,6 +171,9 @@ fingerprints on November 15, 2014.</li>
 field from details documents and optional "advertised_bandwidth" and
 "advertised_bandwidth_fraction" fields from weights documents on November
 16, 2014.</li>
+<li><strong>2.2</strong>: Removed optional "pool_assignment" field and
+added "transports" field to bridge details documents on December 8,
+2014.</li>
 </ul>
 
 </div> <!-- box -->