commit 0205b6c3c3ea1e151060c224dc98cfc23f7d802b Author: Karsten Loesing karsten.loesing@gmx.net Date: Thu Feb 5 13:05:06 2015 +0100

Handle new "tunnelled-dir-server" lines.

These lines are being added as part of #12538, and even though this code has not been merged to master, we shouldn't discard descriptors containing them. The exact format might change in the future. --- src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java index a1bb259..1c64d79 100644 --- a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java @@ -760,7 +760,8 @@ public class SanitizedBridgesWriter extends Thread { || line.equals("caches-extra-info") || line.equals("opt allow-single-hop-exits") || line.equals("allow-single-hop-exits") - || line.startsWith("ipv6-policy ")) { + || line.startsWith("ipv6-policy ") + || line.equals("tunnelled-dir-server")) { scrubbed.append(line + "\n");

/* Replace node fingerprints in the family line with their hashes