From 48cc55c43b6f61e55a8d6c17eacdab8a46e7fe32 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 1 Feb 2013 18:05:29 +0000
Subject: [PATCH] Upgraded Silvertunnel to version 0.15.
---
briar-core/.classpath | 2 +-
...=> silvertunnel.org-netlib-0.15-briar.jar} | Bin 507239 -> 507326 bytes
...ertunnel.org-netlib-0.15-briar-source.jar} | Bin 497577 -> 497680 bytes
...atch => silvertunnel.org-netlib-0.15.patch | 67 ++++++++----------
4 files changed, 30 insertions(+), 39 deletions(-)
rename briar-core/libs/{silvertunnel.org-netlib-0.14-briar.jar => silvertunnel.org-netlib-0.15-briar.jar} (91%)
rename briar-core/libs/source/{silvertunnel.org-netlib-0.14-briar-source.jar => silvertunnel.org-netlib-0.15-briar-source.jar} (91%)
rename silvertunnel.org-netlib-0.14.patch => silvertunnel.org-netlib-0.15.patch (87%)
diff --git a/briar-core/.classpath b/briar-core/.classpath
index f09021d12c..31f5549e7a 100644
--- a/briar-core/.classpath
+++ b/briar-core/.classpath
@@ -9,7 +9,6 @@
<classpathentry kind="lib" path="libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar" sourcepath="libs/source/sc-light-jdk15on-1.47.0.3-SNAPSHOT-source.jar"/>
<classpathentry kind="lib" path="libs/scpkix-jdk15on-1.47.0.3-SNAPSHOT.jar" sourcepath="libs/source/scpkix-jdk15on-1.47.0.3-SNAPSHOT-source.jar"/>
<classpathentry kind="lib" path="libs/scprov-jdk15on-1.47.0.3-SNAPSHOT.jar" sourcepath="libs/source/scprov-jdk15on-1.47.0.3-SNAPSHOT-source.jar"/>
- <classpathentry kind="lib" path="libs/silvertunnel.org-netlib-0.14-briar.jar" sourcepath="libs/source/silvertunnel.org-netlib-0.14-briar-source.jar"/>
<classpathentry kind="lib" path="libs/weupnp-0.1.1.jar"/>
<classpathentry kind="lib" path="libs/bluecove-2.1.1-SNAPSHOT-briar.jar"/>
<classpathentry kind="lib" path="libs/bluecove-gpl-2.1.1-SNAPSHOT.jar"/>
@@ -19,5 +18,6 @@
<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
<classpathentry kind="lib" path="libs/jna-3.5.2-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="libs/platform-3.5.2-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="libs/silvertunnel.org-netlib-0.15-briar.jar" sourcepath="libs/source/silvertunnel.org-netlib-0.15-briar-source.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/briar-core/libs/silvertunnel.org-netlib-0.14-briar.jar b/briar-core/libs/silvertunnel.org-netlib-0.15-briar.jar
similarity index 91%
rename from briar-core/libs/silvertunnel.org-netlib-0.14-briar.jar
rename to briar-core/libs/silvertunnel.org-netlib-0.15-briar.jar
index a0e8966d882902652917aeef2be0efefef188c8a..3b4d6d3a6452c7cb6c721bebdc99b6fdb70f8610 100644
GIT binary patch
delta 12843
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
delta 12833
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
diff --git a/briar-core/libs/source/silvertunnel.org-netlib-0.14-briar-source.jar b/briar-core/libs/source/silvertunnel.org-netlib-0.15-briar-source.jar
similarity index 91%
rename from briar-core/libs/source/silvertunnel.org-netlib-0.14-briar-source.jar
rename to briar-core/libs/source/silvertunnel.org-netlib-0.15-briar-source.jar
index d9bd9fc00289586406f4630f739f0b2a261d29a6..83a2d0bd437ef31610880b56e762388c2f7d0620 100644
GIT binary patch
delta 13982
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
AX8-^I
delta 13814
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
Hb(H)crI9$A
diff --git a/silvertunnel.org-netlib-0.14.patch b/silvertunnel.org-netlib-0.15.patch
similarity index 87%
rename from silvertunnel.org-netlib-0.14.patch
rename to silvertunnel.org-netlib-0.15.patch
index 8d489e41da..a4e0a297f8 100644
--- a/silvertunnel.org-netlib-0.14.patch
+++ b/silvertunnel.org-netlib-0.15.patch
@@ -1,11 +1,11 @@
Only in silvertunnel.org_netlib/lib/main: bcprov-jdk15-145.jar
-Only in silvertunnel.org-netlib-0.14-briar/lib/main: sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar
-Only in silvertunnel.org-netlib-0.14-briar/lib/main: scpkix-jdk15on-1.47.0.3-SNAPSHOT.jar
-Only in silvertunnel.org-netlib-0.14-briar/lib/main: scprov-jdk15on-1.47.0.3-SNAPSHOT.jar
+Only in silvertunnel.org-netlib-0.15-briar/lib/main: sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar
+Only in silvertunnel.org-netlib-0.15-briar/lib/main: scpkix-jdk15on-1.47.0.3-SNAPSHOT.jar
+Only in silvertunnel.org-netlib-0.15-briar/lib/main: scprov-jdk15on-1.47.0.3-SNAPSHOT.jar
Only in silvertunnel.org_netlib/src/main/java: com
-diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/api/impl/SocketTimeoutInputStream.java silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/api/impl/SocketTimeoutInputStream.java
+diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/api/impl/SocketTimeoutInputStream.java silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/api/impl/SocketTimeoutInputStream.java
--- silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/api/impl/SocketTimeoutInputStream.java 2012-01-19 16:46:10.000000000 +0000
-+++ silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/api/impl/SocketTimeoutInputStream.java 2012-12-18 02:51:40.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/api/impl/SocketTimeoutInputStream.java 2012-12-18 02:51:40.000000000 +0000
@@ -111,7 +111,7 @@
synchronized (this) {
throwLastPendingIOException();
@@ -35,9 +35,9 @@ diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/api/imp
}
/**
-diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/circuit/TLSDispatcherThread.java silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/circuit/TLSDispatcherThread.java
+diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/circuit/TLSDispatcherThread.java silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/circuit/TLSDispatcherThread.java
--- silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/circuit/TLSDispatcherThread.java 2012-08-24 15:57:00.000000000 +0100
-+++ silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/circuit/TLSDispatcherThread.java 2012-12-17 21:58:30.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/circuit/TLSDispatcherThread.java 2012-12-17 21:58:30.000000000 +0000
@@ -70,13 +70,13 @@
public void run() {
@@ -54,9 +54,9 @@ diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/t
stopped = true;
break;
}
-diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/clientimpl/Tor.java silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/clientimpl/Tor.java
+diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/clientimpl/Tor.java silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/clientimpl/Tor.java
--- silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/clientimpl/Tor.java 2012-01-20 11:16:16.000000000 +0000
-+++ silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/clientimpl/Tor.java 2012-11-16 18:38:24.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/clientimpl/Tor.java 2012-11-16 18:38:24.000000000 +0000
@@ -131,11 +131,11 @@
@@ -73,9 +73,9 @@ diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/t
}
// logger and config
log.info("Tor implementation of silvertunnel.org is starting up");
-diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/common/LookupServiceUtil.java silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/common/LookupServiceUtil.java
+diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/common/LookupServiceUtil.java silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/common/LookupServiceUtil.java
--- silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/common/LookupServiceUtil.java 2012-01-19 16:46:10.000000000 +0000
-+++ silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/common/LookupServiceUtil.java 2013-01-10 16:18:14.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/common/LookupServiceUtil.java 2013-01-10 16:18:14.000000000 +0000
@@ -18,11 +18,6 @@
package org.silvertunnel.netlib.layer.tor.common;
@@ -123,9 +123,9 @@ diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/t
- }
}
}
-diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/directory/HiddenServiceProperties.java silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/HiddenServiceProperties.java
+diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/directory/HiddenServiceProperties.java silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/HiddenServiceProperties.java
--- silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/directory/HiddenServiceProperties.java 2011-03-25 09:56:20.000000000 +0000
-+++ silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/HiddenServiceProperties.java 2012-11-16 18:48:45.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/HiddenServiceProperties.java 2012-11-16 18:48:45.000000000 +0000
@@ -64,7 +64,7 @@
minimumNumberOfIntroPoints = 3;
try {
@@ -135,9 +135,9 @@ diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/t
generator.initialize(1024, new SecureRandom());
KeyPair keypair = generator.generateKeyPair();
pub = (RSAPublicKey) keypair.getPublic();
-diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RendezvousServiceDescriptorService.java silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RendezvousServiceDescriptorService.java
+diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RendezvousServiceDescriptorService.java silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RendezvousServiceDescriptorService.java
--- silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RendezvousServiceDescriptorService.java 2012-01-19 16:46:10.000000000 +0000
-+++ silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RendezvousServiceDescriptorService.java 2013-01-18 21:52:57.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RendezvousServiceDescriptorService.java 2013-01-18 21:52:57.000000000 +0000
@@ -117,7 +117,7 @@
String response = null;
try {
@@ -159,18 +159,9 @@ diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/t
}
}
-diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RouterImpl.java silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RouterImpl.java
+diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RouterImpl.java silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RouterImpl.java
--- silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RouterImpl.java 2012-09-02 11:58:16.000000000 +0100
-+++ silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RouterImpl.java 2013-01-04 00:34:36.000000000 +0000
-@@ -156,7 +156,7 @@
- PLATFORM_PATTERN = Parsing.compileRegexPattern("^platform (.*?)$");
- PUBLISHED_PATTERN = Parsing.compileRegexPattern("^published (.*?)$");
- UPTIME_PATTERN = Parsing.compileRegexPattern("^uptime (\\d+)");
-- FINGERPRINT_PATTERN = Parsing.compileRegexPattern("^opt fingerprint (.*?)$");
-+ FINGERPRINT_PATTERN = Parsing.compileRegexPattern("^(?:opt )?fingerprint (.*?)$");
- CONTACT_PATTERN = Parsing.compileRegexPattern("^contact (.*?)$");
- ROUTER_PATTERN2 = Parsing.compileRegexPattern("^bandwidth (\\d+) (\\d+) (\\d+)?");
- ONIONKEY_PATTERN = Parsing.compileRegexPattern("^onion-key\n(.*?END RSA PUBLIC KEY......)");
++++ silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/directory/RouterImpl.java 2013-01-04 00:34:36.000000000 +0000
@@ -477,7 +477,7 @@
try {
fingerprint = new FingerprintImpl(Encoding.parseHex(Parsing.parseStringByRE(rd, FINGERPRINT_PATTERN, "")));
@@ -180,9 +171,9 @@ diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/t
}
contact = Parsing.parseStringByRE(rd, CONTACT_PATTERN, "");
-diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encoding.java silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encoding.java
+diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encoding.java silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encoding.java
--- silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encoding.java 2012-01-19 16:46:10.000000000 +0000
-+++ silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encoding.java 2012-11-16 18:37:17.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encoding.java 2012-11-16 18:37:17.000000000 +0000
@@ -250,7 +250,7 @@
/** creates an base64-string out of a byte[] */
@@ -192,9 +183,9 @@ diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/t
}
/**
-diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encryption.java silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encryption.java
+diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encryption.java silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encryption.java
--- silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encryption.java 2012-01-19 16:46:10.000000000 +0000
-+++ silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encryption.java 2012-11-20 15:27:08.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/Encryption.java 2012-11-20 15:27:08.000000000 +0000
@@ -60,21 +60,22 @@
import javax.crypto.Cipher;
@@ -268,9 +259,9 @@ diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/t
} catch (Exception e) {
log.warning("Encryption.extractPublicRSAKey: Caught exception:" + e.getMessage());
-diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/util/PrivateKeyHandler.java silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/PrivateKeyHandler.java
+diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/util/PrivateKeyHandler.java silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/PrivateKeyHandler.java
--- silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/tor/util/PrivateKeyHandler.java 2011-03-25 09:56:22.000000000 +0000
-+++ silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/PrivateKeyHandler.java 2012-11-16 18:48:53.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/layer/tor/util/PrivateKeyHandler.java 2012-11-16 18:48:53.000000000 +0000
@@ -50,7 +50,7 @@
*/
public PrivateKeyHandler() {
@@ -301,9 +292,9 @@ diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/layer/t
java.security.cert.X509Certificate[] x509s = new java.security.cert.X509Certificate[2];
// send the same certificate twice works fine with the default implementation of tor!
-diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/util/Base64.java silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/util/Base64.java
+diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/util/Base64.java silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/util/Base64.java
--- silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/util/Base64.java 2012-01-19 16:46:10.000000000 +0000
-+++ silvertunnel.org-netlib-0.14-briar/src/main/java/org/silvertunnel/netlib/util/Base64.java 2012-11-16 18:37:46.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/main/java/org/silvertunnel/netlib/util/Base64.java 2012-11-16 18:37:46.000000000 +0000
@@ -34,7 +34,7 @@
*/
public static String encode(byte[] input) {
@@ -324,9 +315,9 @@ diff -Bbur silvertunnel.org_netlib/src/main/java/org/silvertunnel/netlib/util/Ba
}
Only in silvertunnel.org_netlib/src/main/resources: com
Only in silvertunnel.org_netlib/src/test/java: com
-diff -Bbur silvertunnel.org_netlib/src/test/java/org/silvertunnel/netlib/layer/tor/directory/AuthorityKeyCertificatesLocalTest.java silvertunnel.org-netlib-0.14-briar/src/test/java/org/silvertunnel/netlib/layer/tor/directory/AuthorityKeyCertificatesLocalTest.java
+diff -Bbur silvertunnel.org_netlib/src/test/java/org/silvertunnel/netlib/layer/tor/directory/AuthorityKeyCertificatesLocalTest.java silvertunnel.org-netlib-0.15-briar/src/test/java/org/silvertunnel/netlib/layer/tor/directory/AuthorityKeyCertificatesLocalTest.java
--- silvertunnel.org_netlib/src/test/java/org/silvertunnel/netlib/layer/tor/directory/AuthorityKeyCertificatesLocalTest.java 2012-01-19 16:46:08.000000000 +0000
-+++ silvertunnel.org-netlib-0.14-briar/src/test/java/org/silvertunnel/netlib/layer/tor/directory/AuthorityKeyCertificatesLocalTest.java 2012-11-16 18:38:10.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/test/java/org/silvertunnel/netlib/layer/tor/directory/AuthorityKeyCertificatesLocalTest.java 2012-11-16 18:38:10.000000000 +0000
@@ -53,9 +53,9 @@
@BeforeClass
@@ -340,9 +331,9 @@ diff -Bbur silvertunnel.org_netlib/src/test/java/org/silvertunnel/netlib/layer/t
}
}
-diff -Bbur silvertunnel.org_netlib/src/test/java/org/silvertunnel/netlib/layer/tor/directory/DirectoryConsensusLocalTest.java silvertunnel.org-netlib-0.14-briar/src/test/java/org/silvertunnel/netlib/layer/tor/directory/DirectoryConsensusLocalTest.java
+diff -Bbur silvertunnel.org_netlib/src/test/java/org/silvertunnel/netlib/layer/tor/directory/DirectoryConsensusLocalTest.java silvertunnel.org-netlib-0.15-briar/src/test/java/org/silvertunnel/netlib/layer/tor/directory/DirectoryConsensusLocalTest.java
--- silvertunnel.org_netlib/src/test/java/org/silvertunnel/netlib/layer/tor/directory/DirectoryConsensusLocalTest.java 2012-01-19 16:46:08.000000000 +0000
-+++ silvertunnel.org-netlib-0.14-briar/src/test/java/org/silvertunnel/netlib/layer/tor/directory/DirectoryConsensusLocalTest.java 2012-11-16 18:38:16.000000000 +0000
++++ silvertunnel.org-netlib-0.15-briar/src/test/java/org/silvertunnel/netlib/layer/tor/directory/DirectoryConsensusLocalTest.java 2012-11-16 18:38:16.000000000 +0000
@@ -60,9 +60,9 @@
@BeforeClass
--
GitLab