[tor-commits] [collector/master] Retain ipv6- lines in bridge extra-infos.

[karsten at torproject.org]

commit 295e2c69def4808c1ccd53aa347ea053c5c4c324
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Aug 5 11:08:51 2020 +0200

    Retain ipv6- lines in bridge extra-infos.
    
    These lines have been added by proposal 313 and are usually not
    included by bridges. But apparently some bridges include them anyway,
    probably bridges that have been configured as non-bridge relays
    before. We should retain them just like we retain other statistics
    lines.
---
 CHANGELOG.md                                                         | 5 ++++-
 .../metrics/collector/bridgedescs/SanitizedBridgesWriter.java        | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1dc8ac..c8ffd84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
-# Changes in version 1.??.? - 2020-??-??
+# Changes in version 1.16.0 - 2020-08-05
+
+ * Medium changes
+   - Retain ipv6- lines in bridge extra-info descriptors.
 
 
 # Changes in version 1.15.2 - 2020-05-17
diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
index c4f783a..b8e7f2d 100644
--- a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
+++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -1193,11 +1193,14 @@ public class SanitizedBridgesWriter extends CollecTorMain {
          * descriptor. */
         } else if (line.startsWith("write-history ")
             || line.startsWith("read-history ")
+            || line.startsWith("ipv6-write-history ")
+            || line.startsWith("ipv6-read-history ")
             || line.startsWith("geoip-start-time ")
             || line.startsWith("geoip-client-origins ")
             || line.startsWith("geoip-db-digest ")
             || line.startsWith("geoip6-db-digest ")
             || line.startsWith("conn-bi-direct ")
+            || line.startsWith("ipv6-conn-bi-direct ")
             || line.startsWith("bridge-")
             || line.startsWith("dirreq-")
             || line.startsWith("cell-")