[tor-commits] [collector/master] Keep "proto" lines in bridge server descriptors.

[karsten at torproject.org]

commit 0925494bb97b0ae2d73ec6050168f4a991ca9f30
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Sep 28 10:03:30 2016 +0200

    Keep "proto" lines in bridge server descriptors.
    
    These lines have been introduced in proposal 264.
    
    Fixes part of #20252.
---
 CHANGELOG.md                                                            | 2 ++
 .../org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99b2918..0121558 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@
      and descriptor type: bridge-statuses-YYYY-MM.tar.xz,
      bridge-server-descriptors-YYYY-MM.tar.xz and
      bridge-extra-infos-YYYY-MM.tar.xz.
+   - Keep "proto" lines in bridge server descriptors as introduced in
+     proposal 264.
 
  * Minor changes
    - Remove quotes around base URL in index.json.
diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
index b61cd30..997791a 100644
--- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
+++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -826,6 +826,7 @@ public class SanitizedBridgesWriter extends CollecTorMain {
             || line.startsWith("platform ")
             || line.startsWith("opt protocols ")
             || line.startsWith("protocols ")
+            || line.startsWith("proto ")
             || line.startsWith("uptime ")
             || line.startsWith("bandwidth ")
             || line.startsWith("opt hibernating ")