commit b65f0a1aa2cf78023964be78b332cced81a1aded Author: Karsten Loesing karsten.loesing@gmx.net Date: Fri Feb 1 05:04:43 2013 +0100

Keep ntor-onion-key lines in sanitized bridge descriptors.

Ian says in #8028 that doing so seems safe to him, because it's just a random group element. --- .../db/bridgedescs/SanitizedBridgesWriter.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java index f014cb5..d7cfb98 100644 --- a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java @@ -733,6 +733,7 @@ public class SanitizedBridgesWriter extends Thread { || line.startsWith("bandwidth ") || line.startsWith("opt hibernating ") || line.startsWith("hibernating ") + || line.startsWith("ntor-onion-key ") || line.equals("opt hidden-service-dir") || line.equals("hidden-service-dir") || line.equals("opt caches-extra-info") @@ -964,7 +965,7 @@ public class SanitizedBridgesWriter extends Thread { outputFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter( outputFile)); - bw.write("@type bridge-extra-info 1.1\n"); + bw.write("@type bridge-extra-info 1.2\n"); bw.write(scrubbedDesc); bw.write("router-digest " + descriptorDigest.toUpperCase() + "\n"); bw.close();