diff --git a/briar-core/.classpath b/briar-core/.classpath
index f09021d12..31f5549e7 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 a0e8966d8..3b4d6d3a6 100644
Binary files a/briar-core/libs/silvertunnel.org-netlib-0.14-briar.jar and b/briar-core/libs/silvertunnel.org-netlib-0.15-briar.jar differ
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 d9bd9fc00..83a2d0bd4 100644
Binary files a/briar-core/libs/source/silvertunnel.org-netlib-0.14-briar-source.jar and b/briar-core/libs/source/silvertunnel.org-netlib-0.15-briar-source.jar differ
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 8d489e41d..a4e0a297f 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