Merge pull request #936 from hypnosis-i2p/openssl

ReloadConfig + --log fix

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

qt/i2pd_qt/mainwindow.cpp

@@ -766,6 +766,8 @@ void MainWindow::SaveTunnelsConfig() {
     outfile << out.str().c_str();
     outfile.close();
 
+    i2p::client::context.ReloadConfig();
+
 }
 
 void MainWindow::TunnelsPageUpdateListenerMainWindowImpl::updated(std::string oldName, TunnelConfig* tunConf) {

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; }