[tor-commits] [orbot/master] updated Tor version to 0.2.5.4-alpha

[n8fr8 at torproject.org]

commit 69614fb6494b012b6b45f90196a2a8f16e40cd49
Author: Nathan Freitas <nathan at freitas.net>
Date:   Sun May 4 00:38:29 2014 -0400

    updated Tor version to 0.2.5.4-alpha
    heartbleed blacklists for non-updated tor nodes
---
 external/tor                                                |    2 +-
 res/values/strings.xml                                      |    2 +-
 src/org/torproject/android/service/TorServiceConstants.java |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/external/tor b/external/tor
index 29a67e7..d2147cc 160000
--- a/external/tor
+++ b/external/tor
@@ -1 +1 @@
-Subproject commit 29a67e73beae804fd9b9347aabb08072c07cbe0d
+Subproject commit d2147cc7ba5c5d5114bae61000cbf757353c3ed6
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3b587bc..1672398 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -210,7 +210,7 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.4.21: https://www.torproject.org</string>
+  <string name="tor_version">Tor v0.2.5.4-alpha: https://www.torproject.org</string>
   <string name="libevent_version">LibEvent v2.0.9: http://www.monkey.org/~provos/libevent/</string>
   <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
   <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java
index f89a892..c964289 100644
--- a/src/org/torproject/android/service/TorServiceConstants.java
+++ b/src/org/torproject/android/service/TorServiceConstants.java
@@ -77,7 +77,7 @@ public interface TorServiceConstants {
     public static final int DISABLE_TOR_MSG = 3;
     public static final int LOG_MSG = 4;
     
-    public static final String BINARY_TOR_VERSION = "0.2.5.3-alpha-openssl1.0.1g-b88";
+    public static final String BINARY_TOR_VERSION = "0.2.5.4-alpha-openssl1.0.1g";
     public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED";
     
     //obfsproxy