From 63e175d3897388985d736626ddb3f3a3b76f5cc8 Mon Sep 17 00:00:00 2001
From: hypnosis-i2p <hypnosis.i2p@gmail.com>
Date: Sun, 27 Aug 2017 20:37:21 +0800
Subject: [PATCH 1/3] fixed #913

---
 qt/i2pd_qt/mainwindow.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qt/i2pd_qt/mainwindow.cpp b/qt/i2pd_qt/mainwindow.cpp
index de32b3cd..f699a131 100644
--- a/qt/i2pd_qt/mainwindow.cpp
+++ b/qt/i2pd_qt/mainwindow.cpp
@@ -766,6 +766,8 @@ void MainWindow::SaveTunnelsConfig() {
     outfile << out.str().c_str();
     outfile.close();
 
+    i2p::client::ClientContext::ReloadConfig();
+
 }
 
 void MainWindow::TunnelsPageUpdateListenerMainWindowImpl::updated(std::string oldName, TunnelConfig* tunConf) {

From fc2ae6f88788a78441b723c5bd9948e10444caf9 Mon Sep 17 00:00:00 2001
From: hypnosis-i2p <hypnosis.i2p@gmail.com>
Date: Sun, 27 Aug 2017 20:52:55 +0800
Subject: [PATCH 2/3] fixed ReloadConfig(); fixed --log

---
 qt/i2pd_qt/mainwindow.cpp | 2 +-
 qt/i2pd_qt/mainwindow.h   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qt/i2pd_qt/mainwindow.cpp b/qt/i2pd_qt/mainwindow.cpp
index f699a131..71d7dca7 100644
--- a/qt/i2pd_qt/mainwindow.cpp
+++ b/qt/i2pd_qt/mainwindow.cpp
@@ -766,7 +766,7 @@ void MainWindow::SaveTunnelsConfig() {
     outfile << out.str().c_str();
     outfile.close();
 
-    i2p::client::ClientContext::ReloadConfig();
+    i2p::client::context.ReloadConfig();
 
 }
 
diff --git a/qt/i2pd_qt/mainwindow.h b/qt/i2pd_qt/mainwindow.h
index 88c84dce..c0286d03 100644
--- a/qt/i2pd_qt/mainwindow.h
+++ b/qt/i2pd_qt/mainwindow.h
@@ -218,7 +218,9 @@ public:
         comboBox->setCurrentText(QString(ld));
     }
     virtual void saveToStringStream(std::stringstream& out){
-        optionValue=comboBox->currentText().toStdString();
+        std::string logDest = comboBox->currentText().toStdString();
+        if(logDest==std::string("stdout"))logDest="";
+        optionValue=logDest;
         MainWindowItem::saveToStringStream(out);
     }
     virtual bool isValid() { return true; }

From 1c3174a277bfe94eca236b4e535c60dd9ec46c91 Mon Sep 17 00:00:00 2001
From: hypnosis-i2p <hypnosis.i2p@gmail.com>
Date: Sun, 27 Aug 2017 21:16:52 +0800
Subject: [PATCH 3/3] fixed #841

---
 android/jni/Application.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index e4a2698a..25f2bb71 100755
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -1,6 +1,7 @@
 #APP_ABI := all
 #APP_ABI := armeabi-v7a x86
 #APP_ABI := x86
+#APP_ABI := x86_64
 APP_ABI := armeabi-v7a
 #can be android-3 but will fail for x86 since arch-x86 is not present at ndkroot/platforms/android-3/ . libz is taken from there.
 APP_PLATFORM := android-14