Verified Commit b2123b87 authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'origin/contact-info'

Closes: #20983.
parents a285fbca f52efc03
Pipeline #34503 passed with stage
in 4 minutes and 33 seconds
......@@ -9,7 +9,7 @@
<property name="javadoc-title" value="CollecTor API Documentation"/>
<property name="implementation-title" value="CollecTor" />
<property name="release.version" value="1.18.1" />
<property name="release.version" value="1.18.1-dev" />
<property name="project-main-class" value="org.torproject.metrics.collector.Main" />
<property name="name" value="collector"/>
<property name="metricslibversion" value="2.18.0" />
......@@ -47,4 +47,3 @@
&base;
</project>
......@@ -115,9 +115,9 @@ public class SanitizedBridgeServerDescriptor
}
scrubbed.newLine();
/* Replace the contact line (if present) with a generic one. */
/* Add the contact line (if present). */
} else if (line.startsWith("contact ")) {
scrubbed.append("contact somebody").newLine();
scrubbed.append(line).newLine();
/* When we reach the signature, we're done. Write the sanitized
* descriptor to disk below. */
......@@ -362,4 +362,3 @@ public class SanitizedBridgeServerDescriptor
return this.descriptorDigest;
}
}
......@@ -191,7 +191,8 @@ public class SanitizedBridgesWriterTest {
"extra-info-digest B026CF0F81712D94BBF1362294882688DF247887 "
+ "/XWPeILeik+uTGaKL3pnUeQfYS87SfjKVkwTiCmbqi0",
"hidden-service-dir",
"contact somebody",
"contact jvictors at jessevictors com, PGP 0xC20BEC80, BTC "
+ "1M6tuPXNmhbgSfaJqnxBUAf5tKi4TVhup8",
"ntor-onion-key YjZG5eaQ1gmXvlSMGEBwM7OLswv8AtXZr6ccOnDUKQw=",
"reject *:*",
"router-digest-sha256 "
......@@ -854,4 +855,3 @@ public class SanitizedBridgesWriterTest {
this.parsedNetworkStatuses.isEmpty());
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment