[tor-commits] [orbot/master] update to 15.0.1-beta-1 and update openssl to 1.0.2a

[n8fr8@xxxxxxxxxxxxxx]

commit 2f8c130f02528d358115ea07f05ea9d8a9a42d48
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date:   Tue May 12 00:38:24 2015 -0400

    update to 15.0.1-beta-1 and update openssl to 1.0.2a
---
 AndroidManifest.xml |    2 +-
 external/openssl    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index da5177d..75d6890 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android";
       package="org.torproject.android" 
-      android:versionName="15.0.1" 
+      android:versionName="15.0.1-beta-1" 
       android:versionCode="150010"
         android:installLocation="auto"      
       >
diff --git a/external/openssl b/external/openssl
index 3df69d3..2b45603 160000
--- a/external/openssl
+++ b/external/openssl
@@ -1 +1 @@
-Subproject commit 3df69d3aefde7671053d4e3c242b228e5d79c83f
+Subproject commit 2b456034457b58454aae3998a2765b6a5b9bc837



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits