diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ce598080..e19432c3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 22dc01da..273698d9 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,16 +1,19 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidDomInspection" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="AndroidLintPxUsage" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintSuspiciousImport" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="BusyWait" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CatchMayIgnoreException" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CodeBlock2Expr" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CollectionAddAllCanBeReplacedWithConstructor" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ConstantConditions" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
       <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
     </inspection_tool>
+    <inspection_tool class="Convert2MethodRef" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="Deprecation" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="DifferentKotlinGradleVersion" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="EmptyStatementBody" enabled="false" level="WARNING" enabled_by_default="false">
@@ -37,6 +40,7 @@
       <option name="processLiterals" value="true" />
       <option name="processComments" value="true" />
     </inspection_tool>
+    <inspection_tool class="StringConcatenationInLoops" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SuspiciousListRemoveInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SuspiciousMethodCalls" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="REPORT_CONVERTIBLE_METHOD_CALLS" value="true" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7871fa88..38d7fe01 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/application_crash.xml" value="0.33" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/certificate_info.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_block_popup.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_clear_bookmark.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_clear_history.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_data_cleared.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_load_new_tab.xml" value="0.33" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_max_tab.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_new_circuit.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_not_supported.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_orbot_connecting.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_panic.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_rate_failure.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_rate_us.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_toast_generic.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_undo.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_update_bridges.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/alert/layout/popup_url_longpress.xml" value="0.20260416666666667" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/setting/layout/setting.xml" value="0.33" />
+        <entry key="..\:/Workspace/Genesis Android/app/src/main/res/layouts/setting/layout/setting_advance_view.xml" value="0.33" />
+      </map>
+    </option>
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
     <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
@@ -25,7 +53,7 @@
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="13">
+        <list size="14">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="2" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
@@ -39,6 +67,7 @@
           <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
           <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
           <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="lombok.NonNull" />
         </list>
       </value>
     </option>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 93e4b17c..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index b9c953c8..e6316e5b 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -78,7 +78,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
@@ -88,23 +87,20 @@ dependencies {
 
     /* Default Libraries */
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
 
     /* Firefox ABI Splits */
 
-    implementation "org.mozilla.components:browser-engine-gecko:73.0.8"
-    implementation "org.mozilla.components:browser-icons:73.0.9"
-    implementation "org.mozilla.geckoview:geckoview:89.0.20210622155641"
-    implementation "org.mozilla.components:concept-fetch:73.0.9"
-    implementation "org.mozilla.components:concept-base:73.0.9"
-    implementation "org.mozilla.components:support-utils:73.0.9"
+    implementation "org.mozilla.components:browser-engine-gecko:75.0.0"
+    implementation "org.mozilla.components:browser-icons:91.0.6"
+    implementation "org.mozilla.geckoview:geckoview: 90.0.20210705185941"
+    implementation "org.mozilla.components:concept-fetch:91.0.6"
+    implementation "org.mozilla.components:concept-base:91.0.6"
+    implementation "org.mozilla.components:support-utils:91.0.6"
 
     /*Crashlytics*/
 
@@ -112,9 +108,10 @@ dependencies {
 
     /* Ads Manager */
 
-    implementation('com.mopub:mopub-sdk:5.17.0@aar') {
+    implementation 'com.facebook.android:audience-network-sdk:6.5.1'
+    /* implementation('com.mopub:mopub-sdk:5.17.0@aar') {
         transitive = true
-    }
+    } */
 
     /* Orbot Service */
 
@@ -125,19 +122,18 @@ dependencies {
     implementation files('libs/httpclientandroidlib-1.2.1.jar')
     implementation 'com.coolerfall:android-http-download-manager:1.6.3'
     implementation 'com.github.intelligo-systems:slight:1.1.3'
-    implementation 'com.github.apl-devs:appintro:v4.2.2'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.volley:volley:1.2.0'
     implementation 'com.github.instacart.truetime-android:library-extension-rx:3.3'
     implementation "net.zetetic:android-database-sqlcipher:4.4.3"
     implementation "androidx.sqlite:sqlite-ktx:2.1.0"
-    implementation 'com.github.apl-devs:appintro:v4.2.2'
     implementation 'androidx.palette:palette-ktx:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
     implementation 'com.google.android.material:material:1.4.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'com.google.android.gms:play-services-ads:20.2.0'
 }
 
 /* Automated APK Generation */
diff --git a/app/genesis/release/app-genesis-arm64-v8a-release.apk b/app/genesis/release/app-genesis-arm64-v8a-release.apk
new file mode 100644
index 00000000..fcfc3c39
Binary files /dev/null and b/app/genesis/release/app-genesis-arm64-v8a-release.apk differ
diff --git a/app/genesis/release/app-genesis-armeabi-v7a-release.apk b/app/genesis/release/app-genesis-armeabi-v7a-release.apk
new file mode 100644
index 00000000..aa812034
Binary files /dev/null and b/app/genesis/release/app-genesis-armeabi-v7a-release.apk differ
diff --git a/app/genesis/release/app-genesis-x86-release.apk b/app/genesis/release/app-genesis-x86-release.apk
new file mode 100644
index 00000000..f9ff5fe0
Binary files /dev/null and b/app/genesis/release/app-genesis-x86-release.apk differ
diff --git a/app/genesis/release/app-genesis-x86_64-release.apk b/app/genesis/release/app-genesis-x86_64-release.apk
new file mode 100644
index 00000000..8532bc4e
Binary files /dev/null and b/app/genesis/release/app-genesis-x86_64-release.apk differ
diff --git a/app/genesis/release/output-metadata.json b/app/genesis/release/output-metadata.json
new file mode 100644
index 00000000..fd7b3c18
--- /dev/null
+++ b/app/genesis/release/output-metadata.json
@@ -0,0 +1,59 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.darkweb.genesissearchengine.production",
+  "variantName": "genesisRelease",
+  "elements": [
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86_64"
+        }
+      ],
+      "versionCode": 178,
+      "versionName": "Build | Dark-Origin 1.4.7.1",
+      "outputFile": "app-genesis-x86_64-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "armeabi-v7a"
+        }
+      ],
+      "versionCode": 175,
+      "versionName": "Build | Dark-Origin 1.4.7.1",
+      "outputFile": "app-genesis-armeabi-v7a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "arm64-v8a"
+        }
+      ],
+      "versionCode": 176,
+      "versionName": "Build | Dark-Origin 1.4.7.1",
+      "outputFile": "app-genesis-arm64-v8a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86"
+        }
+      ],
+      "versionCode": 177,
+      "versionName": "Build | Dark-Origin 1.4.7.1",
+      "outputFile": "app-genesis-x86-release.apk"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 424d6aa2..4366e2da 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,11 +25,12 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:debuggable="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:targetApi="n">
         <activity
-            android:name="com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings.bookmarkSettingController"
+            android:name="com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkSettings.bookmarkSettingController"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:windowSoftInputMode="adjustPan" />
 
@@ -117,13 +118,6 @@
             android:name="com.darkweb.genesissearchengine.appManager.settingManager.searchEngineManager.settingSearchController"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:windowSoftInputMode="adjustPan" />
-        <activity
-            android:name="com.darkweb.genesissearchengine.appManager.landingManager.landingController"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
-            android:label="@string/SETTING_HEADER"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:windowSoftInputMode="adjustPan" />
 
         <activity
             android:name="com.darkweb.genesissearchengine.appManager.settingManager.trackingManager.settingTrackingController"
@@ -133,7 +127,7 @@
             android:name="com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController"
             android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize|locale|layoutDirection|smallestScreenSize|screenLayout"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="fullSensor"
             android:windowSoftInputMode="adjustPan">
             <meta-data
                 android:name="android.app.shortcuts"
@@ -206,7 +200,7 @@
         <!--  -->
         <meta-data
             android:name="com.google.android.gms.ads.APPLICATION_ID"
-            android:value="ca-app-pub-5074525529134731~8620681036" /> <!-- Development Build -->
+            android:value="ca-app-pub-5074525529134731~4717329156" /> <!-- Development Build -->
         <!--
  <meta-data
             android:name="com.google.android.gms.ads.APPLICATION_ID"
@@ -238,19 +232,7 @@
                 <action android:name="org.torproject.android.intent.action.START" />
             </intent-filter>
         </receiver>
-        <!--
- Permissions File Provider Live
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="com.darkweb.genesissearchengine.production.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
-        -->
-        <!-- Permissions File Provider Dev -->
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.darkweb.genesissearchengine.production.provider"
diff --git a/app/src/main/assets/Homepage/javascript/js-homepage.js b/app/src/main/assets/Homepage/javascript/js-homepage.js
index d812d53b..e1f665bd 100644
--- a/app/src/main/assets/Homepage/javascript/js-homepage.js
+++ b/app/src/main/assets/Homepage/javascript/js-homepage.js
@@ -74,9 +74,7 @@ $(window).on('load', function() {
 	// var mResponseJson = '[{ "mIcon":"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico?v=ec617d715196", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"},{ "mIcon":"https://wikileaks.org/static/img/wl-logo.png", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"},{ "mIcon":"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico?v=ec617d715196", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"},{ "mIcon":"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico?v=ec617d715196", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"},{ "mIcon":"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico?v=ec617d715196", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"},{ "mIcon":"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico?v=ec617d715196", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"}]';
 	// setTimeout(mHomepageLoader.onLoadReferenceWebsites, 500);
 	// setTimeout(mHomepageLoader.onLoadReferenceWebsiteContent, 1000, mResponseJson);
-	$(document).ready(function() {
-	    $('body').hide().fadeIn('fast');
-	});
+	document.getElementById("pBody").classList.toggle('body_fadein');
 
 	setTimeout(function (){
 	onTriggerScriptHandler(Commands.onLoadReferenceWebsites, null)
diff --git a/app/src/main/assets/Homepage/style/cs-homepage-dark.css b/app/src/main/assets/Homepage/style/cs-homepage-dark.css
index 60fa1067..e269957c 100644
--- a/app/src/main/assets/Homepage/style/cs-homepage-dark.css
+++ b/app/src/main/assets/Homepage/style/cs-homepage-dark.css
@@ -1,8 +1,8 @@
 /*Search*/
 body{ 
     opacity: 0;
-    transition: opacity 2s;
-    -webkit-transition: opacity 2s; /* Safari */
+    transition: opacity 0s;
+    -webkit-transition: opacity 0s; /* Safari */
 }
 
 .body_fadein {
diff --git a/app/src/main/assets/Homepage/style/cs-homepage.css b/app/src/main/assets/Homepage/style/cs-homepage.css
index 8fb517dd..ec52b8a6 100644
--- a/app/src/main/assets/Homepage/style/cs-homepage.css
+++ b/app/src/main/assets/Homepage/style/cs-homepage.css
@@ -1,6 +1,8 @@
 /*Search*/
 body{ 
-    opacity: 1;
+    opacity: 0;
+    transition: opacity 0s;
+    -webkit-transition: opacity 0s; /* Safari */
 }
   
 .body_fadein {
diff --git a/app/src/main/assets/config/geckoview-config-noimage.yaml b/app/src/main/assets/config/geckoview-config-noimage.yaml
new file mode 100644
index 00000000..dad0e07c
--- /dev/null
+++ b/app/src/main/assets/config/geckoview-config-noimage.yaml
@@ -0,0 +1,56 @@
+# Contents of /data/local/tmp/com.yourcompany.yourapp-geckoview-config.yaml
+
+env:
+  MOZ_LOG: nsHttp:5
+
+
+prefs:
+  network.proxy.type:  1
+  network.proxy.socks:  "127.0.0.1"
+  network.proxy.socks_port:  9050
+  network.proxy.socks_version:  5
+  network.proxy.socks_remote_dns:  true
+  permissions.default.image:  2
+  browser.display.show_image_placeholders: true
+  browser.cache.disk.enable: false
+  browser.cache.memory.enable: true
+  browser.cache.disk.capacity: 0
+  privacy.resistFingerprinting: true
+  privacy.donottrackheader.enabled: false
+  privacy.donottrackheader.value: 1
+  network.http.sendRefererHeader:  0
+  security.checkloaduri: false
+  security.mixed_content.block_active_content: false
+  security.mixed_content.block_display_content:  false
+  media.peerconnection.enabled: false //webrtc disabled
+  browser.cache.disk_cache_ssl: true
+  signon.formlessCapture.enabled: true
+  signon.storeWhenAutocompleteOff: true
+  dom.event.contextmenu.enabled: true
+  layout.css.visited_links_enabled: true
+  security.ssl3.ecdhe_rsa_aes_128_sha: true
+  security.ssl3.ecdhe_ecdsa_aes_128_sha: true
+  security.ssl3.dhe_rsa_aes_128_sha: true
+  security.ssl3.rsa_des_ede3_sha: true
+  security.ssl3.dhe_rsa_aes_256_sha: true
+  browser.safebrowsing.blockedURIs.enabled: false
+  media.gmp-provider.enabled: false
+  browser.send_pings.require_same_host: false
+  webgl.disabled: false
+  pdfjs.enableWebGL: false
+  browser.safebrowsing.malware.enabled: false
+  security.csp.experimentalEnabled: false
+  network.http.referer.spoofSource: false
+  security.OCSP.require: false
+  security.ssl.require_safe_negotiation: false
+  privacy.clearOnShutdown.cache: true
+  privacy.clearOnShutdown.downloads: true
+  privacy.clearOnShutdown.formdata: true
+  privacy.clearOnShutdown.history: true
+  privacy.clearOnShutdown.offlineApps: true
+  privacy.clearOnShutdown.passwords: true
+  privacy.clearOnShutdown.sessions: true
+  privacy.clearOnShutdown.siteSettings: true
+
+
+
diff --git a/app/src/main/assets/config/geckoview-config.yaml b/app/src/main/assets/config/geckoview-config.yaml
new file mode 100644
index 00000000..e4cd5ea5
--- /dev/null
+++ b/app/src/main/assets/config/geckoview-config.yaml
@@ -0,0 +1,56 @@
+# Contents of /data/local/tmp/com.yourcompany.yourapp-geckoview-config.yaml
+
+env:
+  MOZ_LOG: nsHttp:5
+
+
+prefs:
+  network.proxy.type:  1
+  network.proxy.socks:  "127.0.0.1"
+  network.proxy.socks_port:  9050
+  network.proxy.socks_version:  5
+  network.proxy.socks_remote_dns:  true
+  permissions.default.image:  1
+  browser.display.show_image_placeholders: true
+  browser.cache.disk.enable: false
+  browser.cache.memory.enable: true
+  browser.cache.disk.capacity: 0
+  privacy.resistFingerprinting: true
+  privacy.donottrackheader.enabled: false
+  privacy.donottrackheader.value: 1
+  network.http.sendRefererHeader:  0
+  security.checkloaduri: false
+  security.mixed_content.block_active_content: false
+  security.mixed_content.block_display_content:  false
+  media.peerconnection.enabled: false //webrtc disabled
+  browser.cache.disk_cache_ssl: true
+  signon.formlessCapture.enabled: true
+  signon.storeWhenAutocompleteOff: true
+  dom.event.contextmenu.enabled: true
+  layout.css.visited_links_enabled: true
+  security.ssl3.ecdhe_rsa_aes_128_sha: true
+  security.ssl3.ecdhe_ecdsa_aes_128_sha: true
+  security.ssl3.dhe_rsa_aes_128_sha: true
+  security.ssl3.rsa_des_ede3_sha: true
+  security.ssl3.dhe_rsa_aes_256_sha: true
+  browser.safebrowsing.blockedURIs.enabled: false
+  media.gmp-provider.enabled: false
+  browser.send_pings.require_same_host: false
+  webgl.disabled: false
+  pdfjs.enableWebGL: false
+  browser.safebrowsing.malware.enabled: false
+  security.csp.experimentalEnabled: false
+  network.http.referer.spoofSource: false
+  security.OCSP.require: false
+  security.ssl.require_safe_negotiation: false
+  privacy.clearOnShutdown.cache: true
+  privacy.clearOnShutdown.downloads: true
+  privacy.clearOnShutdown.formdata: true
+  privacy.clearOnShutdown.history: true
+  privacy.clearOnShutdown.offlineApps: true
+  privacy.clearOnShutdown.passwords: true
+  privacy.clearOnShutdown.sessions: true
+  privacy.clearOnShutdown.siteSettings: true
+
+
+
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingController.java
index 23e95341..c98d6771 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingController.java
@@ -1,4 +1,4 @@
-package com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings;
+package com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkSettings;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingEnums.java
index 08a8e2cb..007ecfd2 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingEnums.java
@@ -1,4 +1,4 @@
-package com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings;
+package com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkSettings;
 
 public class bookmarkSettingEnums
 {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingModelController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingModelController.java
index 8f0ced5f..cb6ac11a 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingModelController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingModelController.java
@@ -1,4 +1,4 @@
-package com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings;
+package com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkSettings;
 
 import androidx.appcompat.app.AppCompatActivity;
 import com.darkweb.genesissearchengine.constants.strings;
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingViewController.java
index 6586b6ff..c2f5bea3 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingViewController.java
@@ -1,4 +1,4 @@
-package com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings;
+package com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkSettings;
 
 import android.widget.EditText;
 import android.widget.TextView;
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkAdapter.java
index c21fc207..a09fe374 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkAdapter.java
@@ -2,7 +2,6 @@ package com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkHome;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -20,7 +19,6 @@ import com.darkweb.genesissearchengine.eventObserver;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import com.example.myapplication.R;
 
-import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -397,8 +395,8 @@ public class bookmarkAdapter extends RecyclerView.Adapter<bookmarkAdapter.listVi
 
         void bindListView(bookmarkRowModel model, int p_position) {
             mDateContainer = itemView.findViewById(R.id.pDateContainer);
-            mHeader = itemView.findViewById(R.id.pHeader);
-            mDescription = itemView.findViewById(R.id.pDescription);
+            mHeader = itemView.findViewById(R.id.pOrbotRowHeader);
+            mDescription = itemView.findViewById(R.id.pOrbotRowDescription);
             mRowContainer = itemView.findViewById(R.id.pRowContainer);
             mRowMenu = itemView.findViewById(R.id.pRowMenu);
             mDate = itemView.findViewById(R.id.pDate);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkController.java
index b7d6c5ff..128a1111 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkController.java
@@ -24,7 +24,7 @@ import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
-import com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings.bookmarkSettingController;
+import com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkSettings.bookmarkSettingController;
 import com.darkweb.genesissearchengine.dataManager.models.bookmarkRowModel;
 import com.darkweb.genesissearchengine.appManager.homeManager.homeController.editTextManager;
 import com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController;
@@ -305,7 +305,7 @@ public class bookmarkController extends AppCompatActivity
 
     /* UI Redirection */
 
-    public void onBackPressed(View view){
+    public void onClose(View view){
         onBackPressed();
     }
 
@@ -322,7 +322,7 @@ public class bookmarkController extends AppCompatActivity
         for(int m_counter=0;m_counter<m_long_selected_urk.size();m_counter++){
             mHomeController.postNewLinkTabAnimation(m_long_selected_urk.get(m_counter), false);
         }
-        onBackPressed(null);
+        onClose(null);
         mbookmarkAdapter.onTrigger(bookmarkEnums.eBookmarkAdapterCommands.M_CLEAR_LONG_SELECTED_URL,null);
         mbookmarkViewController.onTrigger(bookmarkEnums.eBookmarkViewCommands.M_CLOSE_MENU, null);
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/externalCommandManager/externalShortcutController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/externalCommandManager/externalShortcutController.java
index cba2b87d..4a0bb137 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/externalCommandManager/externalShortcutController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/externalCommandManager/externalShortcutController.java
@@ -2,64 +2,71 @@ package com.darkweb.genesissearchengine.appManager.externalCommandManager;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
+import android.view.View;
+
 import androidx.appcompat.app.AppCompatActivity;
-import com.darkweb.genesissearchengine.appManager.activityContextManager;
 import com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController;
-import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.constants.constants;
 import com.darkweb.genesissearchengine.dataManager.dataController;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import com.example.myapplication.R;
 import org.torproject.android.service.wrapper.orbotLocalConstants;
+import static com.darkweb.genesissearchengine.constants.constants.CONST_EXTERNAL_SHORTCUT_COMMAND_ERASE;
+import static com.darkweb.genesissearchengine.constants.keys.EXTERNAL_SHORTCUT_COMMAND;
 
 public class externalShortcutController extends AppCompatActivity {
 
+    /* Initialize */
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        status.sSettingIsAppStarted = false;
-        orbotLocalConstants.mIsTorInitialized = false;
-        boolean mConnect = false;
 
-        if (getIntent() != null && getIntent().getStringExtra("shortcut") != null) {
-            String bundleString = getIntent().getStringExtra("shortcut");
-            switch (bundleString) {
-                case "erase":
-                    setContentView(R.layout.popup_data_cleared_shortcut);
-                    panicExitInvoked();
-                    new Handler().postDelayed(this::finish, 3000);
-                    return;
-                case "erase_and_open":
-                    panicExitInvoked();
-                    mConnect = true;
-                    break;
-                case "Restart":
-                    break;
+        orbotLocalConstants.mIsTorInitialized = false;
+        Intent mIntent = new Intent(this, homeController.class);
+
+        if(getIntent() != null){
+            String mShortcutCommands = getIntent().getStringExtra(EXTERNAL_SHORTCUT_COMMAND);
+
+            if(mShortcutCommands!=null){
+                mIntent.putExtra(EXTERNAL_SHORTCUT_COMMAND, mShortcutCommands);
+                switch (mShortcutCommands) {
+                    case CONST_EXTERNAL_SHORTCUT_COMMAND_ERASE:
+                        setContentView(R.layout.popup_data_cleared_shortcut);
+                        panicExitInvoked();
+                        return;
+                    case constants.CONST_EXTERNAL_SHORTCUT_COMMAND_ERASE_OPEN:
+                        setContentView(R.layout.empty_view);
+                        panicExitInvoked();
+                        break;
+                    case constants.CONST_EXTERNAL_SHORTCUT_COMMAND_RESTART:
+                        break;
+                }
             }
         }
 
-        setContentView(R.layout.empty_view);
+        /* Start Required Activity */
 
-        if(mConnect){
-            new Handler().postDelayed(() -> activityContextManager.getInstance().getHomeController().onStartApplication(null), 3000);
+        helperMethod.openIntent(mIntent, this, constants.CONST_LIST_EXTERNAL_SHORTCUT);
+    }
+
+    /* UI TRIGGERS */
+
+    public void onUITrigger(View view){
+        if(view.getId() == R.id.pTDDismiss){
+            finishAffinity();
         }
+    }
 
-        helperMethod.onDelayHandler(activityContextManager.getInstance().getHomeController(), 800, () -> {
+    /* Helper Methods */
 
-            /* Start Required Activity */
+    public void panicExitInvoked() {
 
-            Intent intent = new Intent(this.getIntent());
-            intent.setClassName(this.getApplicationContext(), homeController.class.getName());
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-
-            this.startActivity(intent);
-            overridePendingTransition(R.anim.fade_in_lang, R.anim.fade_out_lang);
+        dataController.getInstance().clearData(this);
 
+        helperMethod.onDelayHandler(this, 3000, () -> {
+            finish();
             return null;
         });
     }
-
-    public void panicExitInvoked() {
-        dataController.getInstance().clearData(this);
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/externalCommandManager/externalURLNavigationContoller.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/externalCommandManager/externalURLNavigationContoller.java
index 97379df4..0deabc49 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/externalCommandManager/externalURLNavigationContoller.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/externalCommandManager/externalURLNavigationContoller.java
@@ -2,86 +2,54 @@ package com.darkweb.genesissearchengine.appManager.externalCommandManager;
 
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
 import com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController;
+import com.darkweb.genesissearchengine.constants.constants;
 import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.constants.strings;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
-import com.example.myapplication.R;
 
 import static com.darkweb.genesissearchengine.constants.constants.CONST_PACKAGE_NAME;
+import static com.darkweb.genesissearchengine.constants.keys.EXTERNAL_SHORTCUT_COMMAND_NAVIGATE;
 
 public class externalURLNavigationContoller extends AppCompatActivity {
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
     @Override
-
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Uri data = externalURLNavigationContoller.this.getIntent().getData();
-        boolean mConnect = false;
-
-        if(activityContextManager.getInstance().getHomeController()!=null && (data == null || status.sSettingIsAppStarted)){
-
-            /* Close Activity */
-
-            finish();
-            activityContextManager.getInstance().onClearStack();
-
-            /* Create Request Handler */
-
-            if(status.sSettingIsAppStarted && data!=null){
-                helperMethod.onDelayHandler(this, 250, () -> {
-                    activityContextManager.getInstance().getHomeController().onOpenLinkNewTab(activityContextManager.getInstance().getHomeController().completeURL(data.toString()));
-                    activityContextManager.getInstance().getHomeController().onClearSelectionTab();
-                    return null;
-                });
-            }
-
-            Intent bringToForegroundIntent = new Intent(activityContextManager.getInstance().getHomeController(), homeController.class);
-            bringToForegroundIntent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(bringToForegroundIntent);
-            overridePendingTransition(R.anim.fade_in_instant, R.anim.fade_out_instant);
-            mConnect = true;
+        Uri mData = externalURLNavigationContoller.this.getIntent().getData();
+        if(mData == null){
+            mData = Uri.parse(constants.CONST_BACKEND_GENESIS_URL);
         }
-        else if(status.sSettingIsAppRunning){
 
-            /* Refresh Intent Data */
-
-            finish();
-            status.sExternalWebsite = data.toString();
-
-        }else {
-
-            /* Start Required Activity */
-
-            Intent intent = new Intent(this.getIntent());
-            intent.setClassName(this.getApplicationContext(), homeController.class.getName());
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-
-            if(activityContextManager.getInstance().getHomeController()!=null){
-                activityContextManager.getInstance().getHomeController().onOpenLinkNewTab(data.toString());
-            }else {
-                status.sExternalWebsite = data.toString();
-            }
-
-            /* Bring Application To Front */
-
-            Intent launchIntent = getPackageManager().getLaunchIntentForPackage(CONST_PACKAGE_NAME);
-            startActivity(launchIntent);
-            overridePendingTransition(R.anim.fade_in_instant, R.anim.fade_out_instant);
-            mConnect = true;
-
-            /* Close Activity */
-
-            helperMethod.onDelayHandler(this, 1000, () -> {
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1){
+            if(getReferrer().getHost().equals(CONST_PACKAGE_NAME)){
+                helperMethod.openURLInCustomBrowser(mData.toString(), this);
                 finish();
-                return null;
-            });
+                return;
+            }
         }
-        if(mConnect){
-            new Handler().postDelayed(() -> activityContextManager.getInstance().getHomeController().onStartApplication(null), 3000);
+        else{
+            if(!helperMethod.getHost(mData.toString()).contains(".onion")){
+                helperMethod.openURLInCustomBrowser(mData.toString(), this);
+                finish();
+                return;
+            }
         }
+        if(activityContextManager.getInstance().getHomeController()==null){
+            Intent mIntent = new Intent(this, homeController.class);
+            mIntent.putExtra(EXTERNAL_SHORTCUT_COMMAND_NAVIGATE, mData.toString());
+            helperMethod.openIntent(mIntent, this, constants.CONST_LIST_EXTERNAL_SHORTCUT);
+        }
+        else {
+            activityContextManager.getInstance().getHomeController().onExternalURLInvoke(mData.toString());
+        }
+
+        finish();
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java
index 7f921638..119bfbfa 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java
@@ -2,10 +2,8 @@ package com.darkweb.genesissearchengine.appManager.historyManager;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -474,8 +472,8 @@ public class historyAdapter extends RecyclerView.Adapter<historyAdapter.listView
         @SuppressLint("UseCompatLoadingForDrawables")
         void bindListView(historyRowModel model, int p_position) {
             mDateContainer = itemView.findViewById(R.id.pDateContainer);
-            mHeader = itemView.findViewById(R.id.pHeader);
-            mDescription = itemView.findViewById(R.id.pDescription);
+            mHeader = itemView.findViewById(R.id.pOrbotRowHeader);
+            mDescription = itemView.findViewById(R.id.pOrbotRowDescription);
             mRowContainer = itemView.findViewById(R.id.pRowContainer);
             mRowMenu = itemView.findViewById(R.id.pRowMenu);
             mDate = itemView.findViewById(R.id.pDate);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/errorHandler.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/errorHandler.java
index b4d67906..6d106701 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/errorHandler.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/errorHandler.java
@@ -19,8 +19,10 @@ public class errorHandler
         this.mContext = mContext;
         if (mErrorTemplate == null) {
             StringBuilder builder = new StringBuilder();
-            try (InputStream stream = mResourceURL; BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
+            try  {
 
+                InputStream stream = mResourceURL;
+                BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
                 String line;
                 while ((line = reader.readLine()) != null) {
                     builder.append(line);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/extendedGeckoView.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/extendedGeckoView.java
index 2260dce9..417f541b 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/extendedGeckoView.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/extendedGeckoView.java
@@ -681,19 +681,7 @@ public class extendedGeckoView extends FrameLayout {
      * @param event A {@link MotionEvent}
      * @return One of the {@link PanZoomController#INPUT_RESULT_UNHANDLED INPUT_RESULT_*}) indicating how the event was handled.
      */
-    public @NonNull GeckoResult<Integer> onTouchEventForResult(final @NonNull MotionEvent event) {
-        if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
-            requestFocus();
-        }
 
-        if (mSession == null) {
-            return GeckoResult.fromValue(PanZoomController.INPUT_RESULT_UNHANDLED);
-        }
-
-        // NOTE: Treat mouse events as "touch" rather than as "mouse", so mouse can be
-        // used to pan/zoom. Call onMouseEvent() instead for behavior similar to desktop.
-        return mSession.getPanZoomController().onTouchEventForResult(event);
-    }
 
     @Override
     public boolean onGenericMotionEvent(final MotionEvent event) {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java
index bd9a825d..e124928a 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java
@@ -1,6 +1,7 @@
 package com.darkweb.genesissearchengine.appManager.homeManager.geckoManager;
 
 import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Handler;
@@ -8,24 +9,23 @@ import android.util.Log;
 import android.widget.ImageView;
 import androidx.appcompat.app.AppCompatActivity;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
-import com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController;
 import com.darkweb.genesissearchengine.appManager.kotlinHelperLibraries.BrowserIconManager;
 import com.darkweb.genesissearchengine.constants.*;
 import com.darkweb.genesissearchengine.dataManager.dataController;
 import com.darkweb.genesissearchengine.dataManager.dataEnums;
 import com.darkweb.genesissearchengine.eventObserver;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
-import com.darkweb.genesissearchengine.pluginManager.pluginController;
 
 import java.io.File;
-import java.util.Collections;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_URL_CACHED;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_URL_CACHED_DARK;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_REPORT_URL;
 import static com.darkweb.genesissearchengine.constants.enums.etype.on_handle_external_intent;
-import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_APPLICATION_CRASH;
 import static org.mozilla.geckoview.GeckoSessionSettings.USER_AGENT_MODE_MOBILE;
 import static org.mozilla.geckoview.StorageController.ClearFlags.AUTH_SESSIONS;
 import static org.mozilla.geckoview.StorageController.ClearFlags.COOKIES;
@@ -35,8 +35,10 @@ import static org.mozilla.geckoview.StorageController.ClearFlags.NETWORK_CACHE;
 import static org.mozilla.geckoview.StorageController.ClearFlags.PERMISSIONS;
 import static org.mozilla.geckoview.StorageController.ClearFlags.SITE_DATA;
 import static org.mozilla.geckoview.StorageController.ClearFlags.SITE_SETTINGS;
+
 import org.mozilla.geckoview.ContentBlocking;
 import org.mozilla.geckoview.GeckoRuntime;
+import org.mozilla.geckoview.GeckoRuntimeSettings;
 import org.mozilla.geckoview.GeckoView;
 import org.mozilla.geckoview.WebResponse;
 
@@ -45,7 +47,11 @@ public class geckoClients
     /*Gecko Variables*/
 
     private geckoSession mSession = null;
-    private GeckoRuntime mRuntime = null;
+    private geckoSession mSession1 = null;
+    private geckoSession mSession2 = null;
+    int mCounter = 0;
+
+    private static GeckoRuntime mRuntime = null;
     private BrowserIconManager mIconManager;
     private eventObserver.eventListener event;
 
@@ -66,6 +72,7 @@ public class geckoClients
             if(geckoView.getSession()!=null){
                 geckoView.releaseSession();
             }
+
             mSession = new geckoSession(new geckoViewClientCallback(),mSessionID,context, geckoView);
             mSession.open(mRuntime);
             mSession.getSettings().setUseTrackingProtection(status.sStatusDoNotTrack);
@@ -78,6 +85,7 @@ public class geckoClients
         onUpdateFont();
     }
 
+
     public void onValidateInitializeFromStartup(NestedGeckoView mNestedGeckoView, AppCompatActivity pcontext){
         boolean mStatus = mSession.onValidateInitializeFromStartup();
         if(mStatus){
@@ -138,26 +146,67 @@ public class geckoClients
         return mSession.getUserAgentMode();
     }
 
+
+    public String getAssetsCacheFile(Context context, String fileName) {
+        File cacheFile = new File(context.getCacheDir(), fileName);
+        try {
+            InputStream inputStream = context.getAssets().open(fileName);
+            try {
+                FileOutputStream outputStream = new FileOutputStream(cacheFile);
+                try {
+                    byte[] buf = new byte[1024];
+                    int len;
+                    while ((len = inputStream.read(buf)) > 0) {
+                        outputStream.write(buf, 0, len);
+                    }
+                } finally {
+                    outputStream.close();
+                }
+            } finally {
+                inputStream.close();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return cacheFile.getAbsolutePath();
+    }
+
+
+    static boolean mCreated = false;
     @SuppressLint("WrongConstant")
     public void initRuntimeSettings(AppCompatActivity context){
         if(mRuntime==null){
-            mRuntime = GeckoRuntime.getDefault(context.getApplicationContext());
+            GeckoRuntimeSettings.Builder mSettings = new GeckoRuntimeSettings.Builder();
+            if(status.sShowImages == 2){
+                mSettings.configFilePath(getAssetsCacheFile(context, "config/geckoview-config-noimage.yaml"));
+            }else {
+                mSettings.configFilePath(getAssetsCacheFile(context, "config/geckoview-config.yaml"));
+            }
+            mSettings.build();
+
+            mRuntime = GeckoRuntime.create(context, mSettings.build());
+            mCreated = true;
+            onClearAll();
             mRuntime.getSettings().setAboutConfigEnabled(true);
             mRuntime.getSettings().setAutomaticFontSizeAdjustment(false);
             mRuntime.getSettings().setWebFontsEnabled(status.sShowWebFonts);
             mRuntime.getSettings().setForceUserScalableEnabled(status.sSettingEnableZoom);
             mRuntime.getSettings().getContentBlocking().setCookieBehavior(getCookiesBehaviour());
             mRuntime.getSettings().getContentBlocking().setSafeBrowsing(ContentBlocking.SafeBrowsing.DEFAULT);
-            mIconManager = new BrowserIconManager();
 
             if(status.sSettingTrackingProtection == 1){
                 mRuntime.getSettings().getContentBlocking().setAntiTracking(ContentBlocking.AntiTracking.DEFAULT);
             }else if(status.sSettingTrackingProtection == 2){
                 mRuntime.getSettings().getContentBlocking().setAntiTracking(ContentBlocking.AntiTracking.STRICT);
             }
+
         }
+
+        mIconManager = new BrowserIconManager();
     }
 
+
+
     public void onGetFavIcon(ImageView pImageView, String pURL, AppCompatActivity pcontext){
         pURL = helperMethod.completeURL(helperMethod.getDomainName(pURL));
         mIconManager.onLoadIconIntoView(pcontext,mRuntime, pImageView, pURL);
@@ -174,6 +223,14 @@ public class geckoClients
 
     @SuppressLint("WrongConstant")
     public void updateSetting(NestedGeckoView mNestedGeckoView, AppCompatActivity pcontext){
+        GeckoRuntimeSettings.Builder mSettings = new GeckoRuntimeSettings.Builder();
+        if(status.sShowImages == 2){
+            mSettings.configFilePath(getAssetsCacheFile(pcontext, "config/geckoview-config-noimage.yaml"));
+        }else {
+            mSettings.configFilePath(getAssetsCacheFile(pcontext, "config/geckoview-config.yaml"));
+        }
+        mSettings.build();
+
         mRuntime.getSettings().setRemoteDebuggingEnabled(false);
         mRuntime.getSettings().setWebFontsEnabled(status.sShowWebFonts);
         mRuntime.getSettings().getContentBlocking().setCookieBehavior(getCookiesBehaviour());
@@ -287,6 +344,15 @@ public class geckoClients
        return mSession.isLoaded();
     }
 
+    public void onClearAll(){
+        mRuntime.getStorageController().clearData(NETWORK_CACHE);
+        mRuntime.getStorageController().clearData(IMAGE_CACHE);
+        mRuntime.getStorageController().clearData(DOM_STORAGES);
+        mRuntime.getStorageController().clearData(COOKIES);
+        mRuntime.getStorageController().clearData(SITE_SETTINGS);
+        mRuntime.getStorageController().clearData(SITE_DATA);
+    }
+
     public void onClearSiteData(){
         mRuntime.getStorageController().clearData(SITE_SETTINGS);
         mRuntime.getStorageController().clearData(SITE_DATA);
@@ -321,6 +387,10 @@ public class geckoClients
         }
     }
 
+    public String getSecurityInfo(){
+        return mSession.getSecurityInfo();
+    }
+
     public boolean wasPreviousErrorPage(){
         return mSession.wasPreviousErrorPage();
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java
index 865de656..49d7c92b 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java
@@ -106,6 +106,7 @@ geckoSession extends GeckoSession implements GeckoSession.MediaDelegate,GeckoSes
     private boolean mThemeChanged = false;
     private int mScollOffset = 0;
     private selectionActionDelegate mSelectionActionDelegate;
+    private SecurityInformation securityInfo = null;
 
     /*Temp Variables*/
     private GeckoSession.HistoryDelegate.HistoryList mHistoryList = null;
@@ -305,10 +306,18 @@ geckoSession extends GeckoSession implements GeckoSession.MediaDelegate,GeckoSes
     }
     /*Progress Delegate*/
 
+    @UiThread
+    public void onSecurityChange(@NonNull final GeckoSession session,@NonNull final SecurityInformation securityInfo) {
+        this.securityInfo = securityInfo;
+    }
+
     @Override
     public void onPageStart(@NonNull GeckoSession var1, @NonNull String var2) {
         if(mIsLoaded){
-            event.invokeObserver(Arrays.asList(var2,mSessionID,mCurrentTitle, m_current_url_id, mTheme, this), enums.etype.ON_UPDATE_SEARCH_BAR);
+            mCurrentURL = var2;
+            if(!var2.equals("about:blank")){
+                event.invokeObserver(Arrays.asList(var2,mSessionID,mCurrentTitle, m_current_url_id, mTheme, this), enums.etype.ON_UPDATE_SEARCH_BAR);
+            }
             if(!isPageLoading){
                 mCurrentTitle = "loading";
                 m_current_url_id = -1;
@@ -333,7 +342,7 @@ geckoSession extends GeckoSession implements GeckoSession.MediaDelegate,GeckoSes
         if(var2){
             if(mProgress>=100){
                 //event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, mTheme), enums.etype.ON_UPDATE_THEME);
-                event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, m_current_url_id, mTheme), enums.etype.on_update_favicon);
+                //event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, m_current_url_id, mTheme), enums.etype.on_update_favicon);
                 event.invokeObserver(Arrays.asList(null,mSessionID), enums.etype.on_page_loaded);
 
                 if(!mThemeChanged){
@@ -385,6 +394,30 @@ geckoSession extends GeckoSession implements GeckoSession.MediaDelegate,GeckoSes
         }
     }
 
+    public String getSecurityInfo(){
+        if(securityInfo!=null && securityInfo.certificate!=null){
+
+            String mAlternativeNames = strings.GENERIC_EMPTY_STR;
+            try{
+                for (List name : securityInfo.certificate.getSubjectAlternativeNames()){
+                    mAlternativeNames = mAlternativeNames + name.get(1) + "<br>";
+                }
+
+            }catch (Exception ignored) {}
+
+            return "<br><b>Website</b><br>"+securityInfo.host + "<br><br>" +
+                    "<b>Serial Number</b><br>" + securityInfo.certificate.getSerialNumber() + "<br><br>" +
+                    "<b>Algorithm Name</b><br>" + securityInfo.certificate.getSigAlgName() + "<br><br>" +
+                    "<b>Issued On</b><br>" + securityInfo.certificate.getNotBefore() + "<br><br>" +
+                    "<b>Expires On</b><br>" + securityInfo.certificate.getNotAfter() + "<br><br>" +
+                    "<b>Organization (O)</b><br>" + securityInfo.certificate.getSubjectDN().getName() + "<br><br>" +
+                    "<b>Common Name (CN)</b><br>" + securityInfo.certificate.getIssuerDN().getName() + "<br><br>" +
+                    "<b>Subject Alternative Names</b><br>" + mAlternativeNames;
+        }else {
+            return "Onion Secured Connection";
+        }
+    }
+
     public void onProgressStart(){
         if(!getCurrentURL().equals("about:blank") && !getCurrentURL().contains("genesishiddentechnologies.com") && !wasPreviousErrorPage() && !getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) && !getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) && !getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) && !getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)){
             mContext.get().runOnUiThread(() -> event.invokeObserver(Arrays.asList(5,mSessionID), enums.etype.progress_update));
@@ -606,8 +639,8 @@ geckoSession extends GeckoSession implements GeckoSession.MediaDelegate,GeckoSes
                 }else {
                     mResourceURL = mContext.get().getResources().getAssets().open(CONST_GENESIS_ERROR_CACHED_DARK);
                 }
-            }catch (Exception ignored){
-
+            }catch (Exception ex){
+                Log.i("asd","asd : " + ex.getMessage());
             }
 
             return GeckoResult.fromValue("data:text/html," + handler.createErrorPage(var3.category, var3.code,mContext.get(),var2, mResourceURL));
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/selectionActionDelegate.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/selectionActionDelegate.java
index 0d3b47f2..e8d3b492 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/selectionActionDelegate.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/selectionActionDelegate.java
@@ -156,15 +156,14 @@ public class selectionActionDelegate implements ActionMode.Callback,
      * @return True if the action is presently available.
      */
     protected boolean isActionAvailable(final @NonNull String id) {
-        if (mSelection == null || mSelection.text.toString().length()<1) {
+        if (mSelection == null || mSelection.text.length()<1 || mSelection.text.getBytes().length >= 500000) {
             return false;
         }
 
         if (mExternalActionsEnabled && !mSelection.text.isEmpty() &&
                 ACTION_PROCESS_TEXT.equals(id)) {
             final PackageManager pm = mActivity.getPackageManager();
-            return pm.resolveActivity(getProcessTextIntent(),
-                    PackageManager.MATCH_DEFAULT_ONLY) != null;
+            return pm.resolveActivity(getProcessTextIntent(),PackageManager.MATCH_DEFAULT_ONLY) != null;
         }
         if(id.equals("SEARCH") && !mSelection.text.isEmpty() && mExternalActionsEnabled){
             return true;
@@ -430,7 +429,7 @@ public class selectionActionDelegate implements ActionMode.Callback,
         try{
             if (mUseFloatingToolbar) {
                 String strManufacturer = android.os.Build.MANUFACTURER;
-                if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1 || (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1 && strManufacturer.equals("samsung"))) {
+                if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1 || (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1 && (strManufacturer.toLowerCase().contains("samsung") || android.os.Build.MODEL.toLowerCase().contains("samsung") || Build.PRODUCT.toLowerCase().contains("samsung")))) {
                     mActionMode = mActivity.startActionMode(this);
                 }else {
                     mActionMode = mActivity.startActionMode(new Callback2Wrapper(),ActionMode.TYPE_FLOATING);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/hintManager/hintAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/hintManager/hintAdapter.java
index db23faf8..262fb5c8 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/hintManager/hintAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/hintManager/hintAdapter.java
@@ -16,6 +16,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.darkweb.genesissearchengine.dataManager.models.historyRowModel;
@@ -63,12 +64,10 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
             mHintList.clear();
             mHintList.add( new historyRowModel("Genesis Search", "genesis.onion",-1));
         }
-
         notifyDataSetChanged();
     }
 
     public void onClearAdapter(){
-        //mPastWebIcon.clear();
         mPastWebIcon.remove(0);
         mPastWebIcon.remove(1);
         mPastWebIcon.remove(2);
@@ -103,7 +102,8 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
         TextView mURL;
         ImageButton mMoveURL;
         ImageView mHindTypeIcon;
-        ImageView mHintWebIcon = null;
+        CardView mHintWebIcon = null;
+        ImageView pHintWebIconImage = null;
         LinearLayout mpHintListener;
         ImageView mHindTypeIconTemp;
 
@@ -113,22 +113,23 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
 
         @SuppressLint({"ClickableViewAccessibility", "UseCompatLoadingForDrawables"})
         void bindListView(historyRowModel model) {
-            mHeader = itemView.findViewById(R.id.pHeader);
+            mHeader = itemView.findViewById(R.id.pOrbotRowHeader);
             mHeaderSingle = itemView.findViewById(R.id.pHeaderSingle);
             mURL = itemView.findViewById(R.id.pURL);
             mHindTypeIcon = itemView.findViewById(R.id.pHindTypeIcon);
             mpHintListener = itemView.findViewById(R.id.pHintListener);
             mMoveURL = itemView.findViewById(R.id.pMoveURL);
             mHintWebIcon = itemView.findViewById(R.id.pHintWebIcon);
+            pHintWebIconImage = itemView.findViewById(R.id.pHintWebIconImage);
             mHindTypeIconTemp = new ImageView(mContext);
 
-            mHintWebIcon.setImageTintList(ColorStateList.valueOf(mContext.getResources().getColor(R.color.c_text_v6)));
+            pHintWebIconImage.setImageTintList(ColorStateList.valueOf(mContext.getResources().getColor(R.color.c_text_v6)));
 
             if(mPastWebIcon.containsKey(getLayoutPosition())){
-                mHintWebIcon.setImageDrawable(mPastWebIcon.get(getLayoutPosition()));
-                mHintWebIcon.setImageTintList(null);
+                pHintWebIconImage.setImageDrawable(mPastWebIcon.get(getLayoutPosition()));
+                pHintWebIconImage.setImageTintList(null);
             }else {
-                mHintWebIcon.setImageTintList(ColorStateList.valueOf(mContext.getResources().getColor(R.color.c_text_v8)));
+                pHintWebIconImage.setImageTintList(ColorStateList.valueOf(mContext.getResources().getColor(R.color.c_text_v8)));
 
                 Drawable mDrawable;
                 Resources res = itemView.getContext().getResources();
@@ -136,7 +137,7 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
                     mDrawable = Drawable.createFromXml(res, res.getXml(R.xml.ic_baseline_browser));
                     mMoveURL.setVisibility(View.VISIBLE);
                     mMoveURL.setOnTouchListener(listViewHolder.this);
-                    mHintWebIcon.setImageDrawable(mDrawable);
+                    pHintWebIconImage.setImageDrawable(mDrawable);
                 } catch (Exception ignored) {
                 }
 
@@ -189,9 +190,9 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
             mpHintListener.setOnTouchListener(listViewHolder.this);
 
             if(mURLLink.contains("genesishiddentechnologies.com") || mURLLink.contains("genesis.onion")){
-                mHintWebIcon.setImageTintList(null);
-                mHintWebIcon.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis));
-                mPastWebIcon.put(getLayoutPosition(),mHintWebIcon.getDrawable());
+                pHintWebIconImage.setImageTintList(null);
+                pHintWebIconImage.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis));
+                mPastWebIcon.put(getLayoutPosition(),pHintWebIconImage.getDrawable());
             }else
             {
                 String mURLPast = mURLLink;
@@ -204,9 +205,9 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
                 {
                     if(mHindTypeIconTemp.getDrawable() != null){
                         if(mURLPast.equals(mPastIconFlicker.get(getLayoutPosition()))){
-                            mHintWebIcon.setImageTintList(null);
-                            mHintWebIcon.setImageDrawable(mHindTypeIconTemp.getDrawable());
-                            mPastWebIcon.put(getLayoutPosition(),mHintWebIcon.getDrawable());
+                            pHintWebIconImage.setImageTintList(null);
+                            pHintWebIconImage.setImageDrawable(mHindTypeIconTemp.getDrawable());
+                            mPastWebIcon.put(getLayoutPosition(),pHintWebIconImage.getDrawable());
                         }
                         if(getLayoutPosition() == 1){
                             Log.i("FUSSSS1111","FUSSSS4444");
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java
index cf571ccf..5163b7cd 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java
@@ -1,14 +1,17 @@
 package com.darkweb.genesissearchengine.appManager.homeManager.homeController;
 
 import android.annotation.SuppressLint;
+import android.app.ActivityManager;
 import android.app.DownloadManager;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ComponentCallbacks2;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.Cursor;
@@ -44,7 +47,7 @@ import androidx.fragment.app.FragmentContainerView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
-import com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings.bookmarkSettingController;
+import com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkSettings.bookmarkSettingController;
 import com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkHome.bookmarkController;
 import com.darkweb.genesissearchengine.appManager.historyManager.historyController;
 import com.darkweb.genesissearchengine.dataManager.models.historyRowModel;
@@ -52,7 +55,6 @@ import com.darkweb.genesissearchengine.appManager.homeManager.geckoManager.Neste
 import com.darkweb.genesissearchengine.appManager.homeManager.geckoManager.*;
 import com.darkweb.genesissearchengine.appManager.homeManager.geckoManager.geckoSession;
 import com.darkweb.genesissearchengine.appManager.homeManager.hintManager.hintAdapter;
-import com.darkweb.genesissearchengine.appManager.landingManager.landingController;
 import com.darkweb.genesissearchengine.appManager.languageManager.languageController;
 import com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogController;
 import com.darkweb.genesissearchengine.appManager.orbotManager.orbotController;
@@ -75,7 +77,8 @@ import com.darkweb.genesissearchengine.libs.trueTime.trueTime;
 import com.darkweb.genesissearchengine.pluginManager.pluginController;
 import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
 import com.example.myapplication.R;
-import com.mopub.mobileads.MoPubView;
+import com.google.android.gms.ads.AdView;
+import com.widget.Genesis.widgetManager.widgetController;
 
 import org.mozilla.geckoview.ContentBlocking;
 import org.mozilla.geckoview.GeckoResult;
@@ -100,17 +103,22 @@ import mozilla.components.support.utils.DownloadUtils;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
 import static androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode;
+import static com.darkweb.genesissearchengine.constants.constants.CONST_EXTERNAL_SHORTCUT_COMMAND_ERASE_OPEN;
+import static com.darkweb.genesissearchengine.constants.constants.CONST_EXTERNAL_SHORTCUT_COMMAND_RESTART;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_HELP_URL_CACHE;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_HELP_URL_CACHE_DARK;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_URL_CACHED;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_URL_CACHED_DARK;
 import static com.darkweb.genesissearchengine.constants.enums.etype.GECKO_SCROLL_DOWN;
 import static com.darkweb.genesissearchengine.constants.enums.etype.GECKO_SCROLL_UP_MOVE;
+import static com.darkweb.genesissearchengine.constants.enums.etype.M_HOME_BUTTON_PRESSED;
 import static com.darkweb.genesissearchengine.constants.enums.etype.M_INITIALIZE_TAB_LINK;
 import static com.darkweb.genesissearchengine.constants.enums.etype.M_INITIALIZE_TAB_SINGLE;
 import static com.darkweb.genesissearchengine.constants.enums.etype.M_NEW_LINK_IN_NEW_TAB;
 import static com.darkweb.genesissearchengine.constants.enums.etype.WAS_SCROLL_CHANGED;
 import static com.darkweb.genesissearchengine.constants.enums.etype.open_new_tab;
+import static com.darkweb.genesissearchengine.constants.keys.EXTERNAL_SHORTCUT_COMMAND;
+import static com.darkweb.genesissearchengine.constants.keys.EXTERNAL_SHORTCUT_COMMAND_NAVIGATE;
 import static com.darkweb.genesissearchengine.constants.keys.M_ACTIVITY_RESPONSE;
 import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT;
 import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT;
@@ -140,7 +148,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     private ImageView mLoadingIcon;
     private ImageView mBlocker;
     private TextView mLoadingText;
-    private MoPubView mBannerAds = null;
+    private LinearLayout mBannerAds = null;
     private ImageButton mGatewaySplash;
     private ImageButton mPanicButton;
     private ImageButton mPanicButtonLandscape;
@@ -211,6 +219,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             helperMethod.updateResources(this, status.mSystemLocale.getLanguage());
             pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED);
 
+
             super.onCreate(savedInstanceState);
             setContentView(R.layout.home_view);
 
@@ -229,7 +238,28 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             initWidget();
             initSuggestionView(new ArrayList<>(), strings.GENERIC_EMPTY_STR);
             status.sSettingIsAppRunning = true;
-            org.torproject.android.service.util.Prefs.setContext(activityContextManager.getInstance().getHomeController());
+            initPreFixes();
+            initBundle();
+    }
+
+    public void initBundle(){
+        if(getIntent().getExtras()!=null){
+            String mShortcutCommand = getIntent().getExtras().getString(EXTERNAL_SHORTCUT_COMMAND);
+            String mShortcutCommandNavigate = getIntent().getExtras().getString(EXTERNAL_SHORTCUT_COMMAND_NAVIGATE);
+            if(mShortcutCommand!=null){
+                if(mShortcutCommand.equals(CONST_EXTERNAL_SHORTCUT_COMMAND_ERASE_OPEN) || mShortcutCommand.equals(CONST_EXTERNAL_SHORTCUT_COMMAND_RESTART)){
+                    onStartApplication(null);
+                }
+            }
+            if(mShortcutCommandNavigate!=null){
+                status.sExternalWebsite = mShortcutCommandNavigate;
+                onStartApplication(null);
+            }
+        }
+    }
+
+    public boolean isSplashScreenLoading(){
+        return mSplashScreen.getAlpha()!=0;
     }
 
     public void initWidget(){
@@ -340,6 +370,10 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             }
     }
 
+    public void onUpdateBannerAdvert(){
+        mHomeViewController.updateBannerAdvertStatus(true, (boolean)pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
+    }
+
     public void onLoadTabOnResume(){
         Object mTempModel = dataController.getInstance().invokeTab(dataEnums.eTabCommands.GET_CURRENT_TAB, null);
         if(mTempModel!=null){
@@ -409,9 +443,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     }
 
     public void initLandingPage(){
-        if(!status.sLandingPageStatus){
-            helperMethod.openActivity(landingController.class, constants.CONST_LIST_HISTORY, homeController.this,false);
-        }
     }
 
     public void initializeAppModel()
@@ -431,7 +462,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mWebViewContainer = findViewById(R.id.pWebLayoutView);
         mTopLayout = findViewById(R.id.pTopLayout);
         mLoadingIcon = findViewById(R.id.pLoadingIcon);
-        mBannerAds = findViewById(R.id.pAdView);
+        mBannerAds = findViewById(R.id.adView);
         mGatewaySplash = findViewById(R.id.pSettings);
         mTopBar = findViewById(R.id.pTopbar);
         mBackSplash = findViewById(R.id.pTopImage);
@@ -442,7 +473,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mFindCount = findViewById(R.id.pFindCount);
         mVoiceInput = findViewById(R.id.pVoiceInput);
         mMenu = findViewById(R.id.pMenu);
-        mBlocker = findViewById(R.id.pBlocker);
+        mBlocker = findViewById(R.id.pSecureRootBlocker);
         mNestedScroll = findViewById(R.id.pNestedScroll);
         mBlockerFullSceen = findViewById(R.id.pBlockerFullSceen);
         mCopyright = findViewById(R.id.pCopyright);
@@ -487,6 +518,15 @@ public class homeController extends AppCompatActivity implements ComponentCallba
 
     public void initPreFixes() {
         try {
+            String strManufacturer = android.os.Build.MANUFACTURER;
+            if((Build.VERSION.SDK_INT == Build.VERSION_CODES.O || Build.VERSION.SDK_INT == Build.VERSION_CODES.O_MR1) && strManufacturer.equals("samsung")){
+                PackageManager packageManager = getApplicationContext().getPackageManager();
+                packageManager.setComponentEnabledSetting(new ComponentName(getApplicationContext(), widgetController.class), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+            }else {
+                PackageManager packageManager = getApplicationContext().getPackageManager();
+                packageManager.setComponentEnabledSetting(new ComponentName(getApplicationContext(), widgetController.class), PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
+            }
+
             if(getIntent().getBooleanExtra("crash", false)){
                 new Handler().postDelayed(() ->
                 {
@@ -577,6 +617,14 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mGeckoClient.initialize(mGeckoView, new geckoViewCallback(), this,false);
     }
 
+    public void onExternalURLInvoke(String pData){
+        if(status.sSettingIsAppStarted){
+            onOpenLinkNewTab(pData);
+        }else {
+            status.sExternalWebsite = pData;
+            onStartApplication(null);
+        }
+    }
 
     public void onLoadURL(String url){
         if(mGeckoView.getSession()!=null && !mGeckoView.getSession().isOpen()){
@@ -588,6 +636,10 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mGeckoClient.loadURL(url.replace("genesis.onion","genesishiddentechnologies.com"),mGeckoView, homeController.this);
     }
 
+    public String getSecurityInfo(){
+        return mGeckoClient.getSecurityInfo();
+    }
+
     public void onLoadTab(geckoSession mTempSession, boolean isSessionClosed, boolean pExpandAppBar, boolean pForced){
 
         if(!isSessionClosed){
@@ -733,8 +785,10 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     @SuppressLint("ClickableViewAccessibility")
     @Override
     protected void onDestroy() {
+        pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_DESTROY);
         if(!status.sSettingIsAppStarted){
             super.onDestroy();
+            mGeckoClient.onClearAll();
             return;
         }
 
@@ -751,17 +805,30 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         // mGeckoView.onDestroy();
 
         unregisterReceiver(downloadStatus);
+        activityContextManager.getInstance().getHomeController().onResetData();
 
         super.onDestroy();
     }
 
+    private boolean isMyServiceRunning(Class<?> serviceClass) {
+        ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (serviceClass.getName().equals(service.service.getClassName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.M)
     @SuppressLint("ClickableViewAccessibility")
     private void initializeLocalEventHandlers() {
 
 
         mSearchbar.setMovementMethod(null);
-        startService(new Intent(getBaseContext(), activityStateManager.class));
+        if(!isMyServiceRunning(activityStateManager.class)){
+            startService(new Intent(getBaseContext(), activityStateManager.class));
+        }
 
         registerReceiver(downloadStatus,new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
 
@@ -1000,6 +1067,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         }, 250);
     }
 
+
     public void onSuggestionMove(View view){
         String val = view.getTag().toString();
         mHomeViewController.onUpdateSearchBar(val,false,false, true);
@@ -1009,7 +1077,8 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         pluginController.getInstance().onAdsInvoke(Collections.singletonList(this), pluginEnums.eAdManager.M_INITIALIZE_BANNER_ADS);
         mGeckoClient.getSession().setTheme(null);
         mHomeViewController.onUpdateStatusBarTheme(mGeckoClient.getTheme(), true);
-        onLoadURL(helperMethod.getDomainName(mHomeModel.getSearchEngine()));
+
+        mHomeViewController.onNewTabAnimation(Collections.singletonList(helperMethod.getDomainName(mHomeModel.getSearchEngine())), M_HOME_BUTTON_PRESSED);
     }
 
     /*TAB CONTROLLER EVENTS*/
@@ -1057,7 +1126,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             mGeckoView.getSession().setActive(true);
 
         }else {
-            onLoadURL("about:blank");
             mHomeViewController. onUpdateSearchBar(strings.HOME_BLANK_PAGE,false,true, false);
             mHomeViewController.onNewTab();
         }
@@ -1071,7 +1139,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mHomeViewController.progressBarReset();
         mHomeViewController.onUpdateSearchBar(url,false,true, false);
         mGeckoClient.loadURL(url, mGeckoView, homeController.this);
-
+        Log.i("superman2222","superman2222");
         if(isRemovable){
             mGeckoClient.setRemovableFromBackPressed(true);
         }
@@ -1331,11 +1399,13 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             mHomeViewController.onClearSelections(true);
             mHomeViewController.onUpdateSearchBar(mGeckoClient.getSession().getCurrentURL(),false,true, true);
 
-            //mHomeViewController.initTopBarPadding();
-            //mHomeViewController.onSetBannerAdMargin(!mGeckoClient.isLoading(),(boolean)pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED)&&!!mGeckoClient.isLoading());
+            // mHomeViewController.initTopBarPadding();
+            // mHomeViewController.onSetBannerAdMargin(!mGeckoClient.isLoading(),(boolean)pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED)&&!!mGeckoClient.isLoading());
 
             mHomeViewController.expandTopBar(false, mGeckoView.getMaxY());
             status.sUIInteracted = true;
+            mHomeViewController.initSearchEngineView();
+
     }
 
     @Override
@@ -1597,7 +1667,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mGeckoClient.manualDownloadWithName(pURL,pPath,this);
     }
 
-    public MoPubView getBannerAd()
+    public LinearLayout getBannerAd()
     {
         return mBannerAds;
     }
@@ -1755,23 +1825,12 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             {
                 pluginController.getInstance().onOrbotInvoke(Collections.singletonList(status.mThemeApplying), pluginEnums.eOrbotManager.M_DESTROY);
 
-                new Handler().postDelayed(() ->
-                {
-                    status.sSettingIsAppStarted = false;
-                    finishAndRemoveTask();
+                finishAffinity();
+                overridePendingTransition(R.anim.popup_scale_in, R.anim.popup_scale_out);
+                activityContextManager.getInstance().getHomeController().onResetData();
+                mGeckoClient.onClearAll();
+                status.sSettingIsAppStarted = false;
 
-                    new Thread(){
-                        public void run(){
-                            try {
-                                sleep(1000);
-                                android.os.Process.killProcess(android.os.Process.myPid());
-                                System.exit(1);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }.start();
-                }, 100);
             }
             else if (menuId == R.id.pMenuFind)
             {
@@ -1857,16 +1916,31 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mHomeViewController.onUpdateStatusBarTheme(mGeckoClient.getTheme(), true);
     }
 
+    public void onResetData(){
+        mGeckoClient.onClearAll();
+    }
+
     public void onOrbotLog(View view) {
         mHomeViewController.closeMenu();
         helperMethod.openActivity(orbotLogController.class, constants.CONST_LIST_HISTORY, homeController.this,true);
     }
 
     public void panicExit(View view) {
+        mGeckoClient.onClearAll();
         pluginController.getInstance().onMessageManagerInvoke(null, M_RESET);
         pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(homeController.this), M_PANIC_RESET);
     }
 
+    public void quitApplication(){
+        pluginController.getInstance().onOrbotInvoke(Collections.singletonList(status.mThemeApplying), pluginEnums.eOrbotManager.M_DESTROY);
+
+        finishAffinity();
+        overridePendingTransition(R.anim.popup_scale_in, R.anim.popup_scale_out);
+        activityContextManager.getInstance().getHomeController().onResetData();
+        mGeckoClient.onClearAll();
+        status.sSettingIsAppStarted = false;
+    }
+
     public void panicExitInvoked() {
         dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_SEARCH_HISTORY,true));
         dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_SEARCH_SUGGESTION,true));
@@ -1905,6 +1979,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.BRIDGE_ENABLES,false));
         dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_GATEWAY_MANUAL,false));
         dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_INSTALLED,false));
+        mGeckoClient.onClearAll();
 
 
         dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_CLEAR_TAB, null);
@@ -2033,6 +2108,10 @@ public class homeController extends AppCompatActivity implements ComponentCallba
            else if(e_type.equals(M_INITIALIZE_TAB_SINGLE)){
                initTabCount(enums.etype.ON_NEW_TAB_ANIMATION,data);
            }
+           else if(e_type.equals(M_HOME_BUTTON_PRESSED)){
+               onLoadURL((String) data.get(0));
+               initTabCount(null,data);
+           }
            else if(e_type.equals(M_INITIALIZE_TAB_LINK)){
                postNewLinkTabAnimation((String)data.get(0),false);
            }
@@ -2040,6 +2119,12 @@ public class homeController extends AppCompatActivity implements ComponentCallba
            {
                mHomeViewController.onSetBannerAdMargin((boolean)data.get(0),(boolean)pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
            }
+           else if(e_type.equals(enums.etype.M_ON_BANNER_UPDATE)){
+               Object mStatus = pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED);
+               if(mStatus!=null){
+                   mHomeViewController.updateBannerAdvertStatus(false, (boolean)mStatus);
+               }
+           }
            else if(e_type.equals(enums.etype.M_GET_CURRENT_URL))
            {
                if(mGeckoClient==null || mGeckoClient.getSession()==null){
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java
index 3863e668..85d09088 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java
@@ -16,6 +16,7 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.InsetDrawable;
 import android.graphics.drawable.StateListDrawable;
+import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
@@ -46,9 +47,8 @@ import com.darkweb.genesissearchengine.libs.views.ColorAnimator;
 import com.darkweb.genesissearchengine.eventObserver;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import com.example.myapplication.R;
+import com.google.android.gms.ads.AdView;
 import com.google.android.material.appbar.AppBarLayout;
-import com.mopub.mobileads.MoPubView;
-
 import org.mozilla.geckoview.GeckoView;
 import org.torproject.android.service.wrapper.orbotLocalConstants;
 import java.util.Arrays;
@@ -62,6 +62,7 @@ import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_URL_CACHED;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_URL_CACHED_DARK;
 import static org.mozilla.geckoview.GeckoSessionSettings.USER_AGENT_MODE_DESKTOP;
+import static java.lang.Thread.sleep;
 
 class homeViewController
 {
@@ -76,7 +77,7 @@ class homeViewController
     private editTextManager mSearchbar;
     private ConstraintLayout mSplashScreen;
     private TextView mLoadingText;
-    private com.mopub.mobileads.MoPubView mBannerAds = null;
+    private LinearLayout mBannerAds = null;
     private Handler mUpdateUIHandler = null;
     private ImageButton mGatewaySplash;
     private LinearLayout mTopBar;
@@ -120,7 +121,7 @@ class homeViewController
     private Runnable mTabDialogRunnable = null;
     private boolean mIsTopBarExpanded = true;
 
-    void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, ConstraintLayout webviewContainer, TextView loadingText, ProgressBar progressBar, editTextManager searchbar, ConstraintLayout splashScreen, ImageView loading, MoPubView banner_ads, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button, View pFindBar, EditText pFindText, TextView pFindCount, androidx.constraintlayout.widget.ConstraintLayout pTopLayout, ImageButton pVoiceInput, ImageButton pMenu, androidx.core.widget.NestedScrollView pNestedScroll, ImageView pBlocker, ImageView pBlockerFullSceen, View mSearchEngineBar, TextView pCopyright, RecyclerView pHistListView, com.google.android.material.appbar.AppBarLayout pAppBar, ImageButton pOrbotLogManager, ConstraintLayout pInfoLandscape, ConstraintLayout pInfoPortrait, ProgressBar pProgressBarIndeterminate, FragmentContainerView pTabFragment, LinearLayout pTopBarContainer, ImageView pSearchLock, View pPopupLoadNewTab, ImageView pTopBarHider, ImageView pNewTabBlocker, CoordinatorLayout mCoordinatorLayout, ImageView pImageDivider, ImageButton pPanicButton, ImageView pGenesisLogo, ImageButton pPanicButtonLandscape){
+    void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, ConstraintLayout webviewContainer, TextView loadingText, ProgressBar progressBar, editTextManager searchbar, ConstraintLayout splashScreen, ImageView loading, LinearLayout banner_ads, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button, View pFindBar, EditText pFindText, TextView pFindCount, androidx.constraintlayout.widget.ConstraintLayout pTopLayout, ImageButton pVoiceInput, ImageButton pMenu, androidx.core.widget.NestedScrollView pNestedScroll, ImageView pBlocker, ImageView pBlockerFullSceen, View mSearchEngineBar, TextView pCopyright, RecyclerView pHistListView, com.google.android.material.appbar.AppBarLayout pAppBar, ImageButton pOrbotLogManager, ConstraintLayout pInfoLandscape, ConstraintLayout pInfoPortrait, ProgressBar pProgressBarIndeterminate, FragmentContainerView pTabFragment, LinearLayout pTopBarContainer, ImageView pSearchLock, View pPopupLoadNewTab, ImageView pTopBarHider, ImageView pNewTabBlocker, CoordinatorLayout mCoordinatorLayout, ImageView pImageDivider, ImageButton pPanicButton, ImageView pGenesisLogo, ImageButton pPanicButtonLandscape){
         this.mContext = context;
         this.mProgressBar = progressBar;
         this.mSearchbar = searchbar;
@@ -162,6 +163,7 @@ class homeViewController
         this.mPanicButton = pPanicButton;
         this.mGenesisLogo = pGenesisLogo;
         this.mPanicButtonLandscape = pPanicButtonLandscape;
+        this.mLogHandler = new LogHandler();
 
         initSplashScreen();
         createUpdateUiHandler();
@@ -216,7 +218,22 @@ class homeViewController
                 mGenesisLogo.setLayoutParams(newLayoutParams);
             }
         });
+        initSearchEngineView();
+    }
 
+    public void initSearchEngineView(){
+        ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) mSearchEngineBar.getLayoutParams();
+        if(isLandscape){
+            layoutParams.setMargins(0, helperMethod.pxFromDp(60), 0, 0);
+        }else {
+            Object mAdvertLoaded = mEvent.invokeObserver(null, enums.etype.M_ADVERT_LOADED);
+            if(mAdvertLoaded!=null && (boolean)mAdvertLoaded && mBannerAds.getVisibility() == View.VISIBLE){
+                layoutParams.setMargins(0, mBannerAds.getHeight() + helperMethod.pxFromDp(60), 0, 0);
+            }else {
+                layoutParams.setMargins(0, helperMethod.pxFromDp(60), 0, 0);
+            }
+        }
+        mSearchEngineBar.setLayoutParams(layoutParams);
     }
 
     @SuppressLint("WrongConstant")
@@ -275,8 +292,6 @@ class homeViewController
 
     public void onShowTabContainer(){
         if(mTabFragment.getAlpha()==0 || mTabFragment.getAlpha()==1){
-
-            onUpdateStatusBarTheme(null, false);
             mTabFragment.animate().cancel();
             mTabFragment.setAlpha(0);
             mTabFragment.setVisibility(View.VISIBLE);
@@ -474,7 +489,7 @@ class homeViewController
     }
 
     public void initStatusBarColor(boolean mInstant) {
-        int mDelay = 2000;
+        int mDelay = 1500;
         if(status.mThemeApplying || mInstant){
             mDelay = 0;
         }
@@ -590,70 +605,75 @@ class homeViewController
 
     }
 
+    private LogHandler mLogHandler;
+    @SuppressLint("StaticFieldLeak")
+    class LogHandler extends AsyncTask<Void, Integer, Void> {
+        protected Void doInBackground(Void...arg0) {
+            AppCompatActivity temp_context = mContext;
+            int mCounter = 0;
+            int mCounterInternet = 0;
+            while (!orbotLocalConstants.mIsTorInitialized || !orbotLocalConstants.mNetworkState){
+                try
+                {
+                    boolean mFastConnect = !status.sRestoreTabs && status.sAppInstalled && status.sSettingSearchStatus.equals(constants.CONST_BACKEND_GENESIS_URL) && !status.sBridgeStatus && status.sExternalWebsite.equals(strings.GENERIC_EMPTY_STR);
+                    if(mFastConnect){
+                        sleep(1000);
+                        if(orbotLocalConstants.mNetworkState){
+                            orbotLocalConstants.mTorLogsStatus = "Starting Genesis | Please Wait ...";
+                            mEvent.invokeObserver(Collections.singletonList(status.sSettingSearchStatus), enums.etype.recheck_orbot);
+                            startPostTask(messages.MESSAGE_UPDATE_LOADING_TEXT);
+                            break;
+                        }else{
+                            orbotLocalConstants.mTorLogsStatus = "No internet connection";
+                            startPostTask(messages.MESSAGE_UPDATE_LOADING_TEXT);
+                            if(mCounterInternet>10){
+                                // break;
+                            }else {
+                                mCounterInternet += 1;
+                            }
+                        }
+                    }
+
+                    sleep(500);
+                    if(mCounter>20){
+                        break;
+                    }else {
+                        mCounter+=1;
+                    }
+                    if(mFastConnect){
+                        continue;
+                    }
+
+                    mEvent.invokeObserver(Collections.singletonList(status.sSettingSearchStatus), enums.etype.recheck_orbot);
+                    if(temp_context.isDestroyed()){
+                        return null;
+                    }
+                    startPostTask(messages.MESSAGE_UPDATE_LOADING_TEXT);
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                }
+            }
+            if(!status.sSettingIsAppStarted){
+                mContext.runOnUiThread(() -> {
+                    splashScreenDisable();
+                });
+                startPostTask(messages.MESSAGE_ON_URL_LOAD);
+            }else {
+                mContext.runOnUiThread(() -> {
+                    mEvent.invokeObserver(null, enums.etype.ON_LOAD_TAB_ON_RESUME);
+                });
+            }
+            return null;
+        }
+    }
+
     void initProxyLoading(Callable<String> logs){
         this.mLogs = logs;
 
         if(mSplashScreen.getVisibility()==View.VISIBLE){
-            new Thread(){
-                public void run(){
-                    AppCompatActivity temp_context = mContext;
-                    int mCounter = 0;
-                    int mCounterInternet = 0;
-                    while (!orbotLocalConstants.mIsTorInitialized || !orbotLocalConstants.mNetworkState){
-                        try
-                        {
-                            boolean mFastConnect = !status.sRestoreTabs && status.sAppInstalled && status.sSettingSearchStatus.equals(constants.CONST_BACKEND_GENESIS_URL) && !status.sBridgeStatus;
-                            if(mFastConnect){
-                                sleep(1000);
-                                if(orbotLocalConstants.mNetworkState){
-                                    orbotLocalConstants.mTorLogsStatus = "Starting Genesis | Please Wait ...";
-                                    mEvent.invokeObserver(Collections.singletonList(status.sSettingSearchStatus), enums.etype.recheck_orbot);
-                                    startPostTask(messages.MESSAGE_UPDATE_LOADING_TEXT);
-                                    break;
-                                }else{
-                                    orbotLocalConstants.mTorLogsStatus = "No internet connection";
-                                    startPostTask(messages.MESSAGE_UPDATE_LOADING_TEXT);
-                                    if(mCounterInternet>10){
-                                        // break;
-                                    }else {
-                                        mCounterInternet += 1;
-                                    }
-                                }
-                            }
-
-                            sleep(500);
-                            if(mCounter>20){
-                                break;
-                            }else {
-                                mCounter+=1;
-                            }
-                            if(mFastConnect){
-                                continue;
-                            }
-
-                            mEvent.invokeObserver(Collections.singletonList(status.sSettingSearchStatus), enums.etype.recheck_orbot);
-                            if(temp_context.isDestroyed()){
-                                return;
-                            }
-                            startPostTask(messages.MESSAGE_UPDATE_LOADING_TEXT);
-                        }
-                        catch (Exception e)
-                        {
-                            e.printStackTrace();
-                        }
-                    }
-                    if(!status.sSettingIsAppStarted){
-                        mContext.runOnUiThread(() -> {
-                            splashScreenDisable();
-                        });
-                        startPostTask(messages.MESSAGE_ON_URL_LOAD);
-                    }else {
-                        mContext.runOnUiThread(() -> {
-                           mEvent.invokeObserver(null, enums.etype.ON_LOAD_TAB_ON_RESUME);
-                        });
-                    }
-                }
-            }.start();
+            this.mLogHandler.execute();
         }
     }
 
@@ -679,6 +699,7 @@ class homeViewController
     private boolean mIsAnimating = false;
     public void splashScreenDisable(){
         mTopBar.setAlpha(1);
+        mGeckoView.setVisibility(View.VISIBLE);
 
         if(mSplashScreen.getAlpha()==1){
             if(!mIsAnimating){
@@ -803,13 +824,14 @@ class homeViewController
             helperMethod.hideKeyboard(mContext);
             popupWindow.setHeight(height);
         }
-
         if(status.sSettingLanguageRegion.equals("Ur") || status.sSettingLanguage.equals("default") && status.mSystemLocale.getLanguage().equals("ur")){
             popupWindow.showAtLocation(parent, Gravity.TOP|Gravity.START,0,0);
         }else {
             popupWindow.showAtLocation(parent, Gravity.TOP|Gravity.END,0,0);
         }
 
+
+        ScrollView mScrollView = popupView.findViewById(R.id.pScrollView);
         ImageButton bookmark = popupView.findViewById(R.id.menu23);
         ImageButton back = popupView.findViewById(R.id.menu22);
         ImageButton close = popupView.findViewById(R.id.menu20);
@@ -828,6 +850,19 @@ class homeViewController
             }
         }
 
+        ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) mScrollView.getLayoutParams();
+        if(isLandscape){
+            layoutParams.setMargins(mScrollView.getLeft(), helperMethod.pxFromDp(7), mScrollView.getRight(), helperMethod.pxFromDp(10));
+        }else {
+            Object mAdvertLoaded = mEvent.invokeObserver(null, enums.etype.M_ADVERT_LOADED);
+            if(mAdvertLoaded!=null && (boolean)mAdvertLoaded){
+                layoutParams.setMargins(mScrollView.getLeft(), mBannerAds.getHeight(), mScrollView.getRight(), helperMethod.pxFromDp(30));
+            }else {
+                layoutParams.setMargins(mScrollView.getLeft(), helperMethod.pxFromDp(7), mScrollView.getRight(), helperMethod.pxFromDp(30));
+            }
+        }
+        mScrollView.setLayoutParams(layoutParams);
+
         String mExtention = helperMethod.getMimeType(mURL, mContext);
         if(!mURL.startsWith("data") && !mURL.startsWith("blob") && (mExtention == null || mExtention.equals("application/x-msdos-program") || mExtention.equals("text/html") || mExtention.equals("application/vnd.ms-htmlhelp") || mExtention.equals("application/vnd.sun.xml.writer") || mExtention.equals("application/vnd.sun.xml.writer.global") || mExtention.equals("application/vnd.sun.xml.writer.template") || mExtention.equals("application/xhtml+xml"))){
             mDownload.setEnabled(false);
@@ -944,12 +979,16 @@ class homeViewController
             }
             onSetBannerAdMargin(false,true);
         }
+        initSearchEngineView();
     }
 
     void removeBanner(){
-        mBannerAds.setVisibility(View.GONE);
-        mWebviewContainer.setPadding(0,0,0,0);
-        onFullScreen(false);
+        // if(isLandscape){
+        //     mBannerAds.setVisibility(View.GONE);
+        // }else {
+        //    mEvent.invokeObserver(null, enums.etype.M_ON_BANNER_UPDATE);
+        // }
+        // onFullScreen(false);
     }
 
     private Handler searchBarUpdateHandler = new Handler();
@@ -1053,16 +1092,16 @@ class homeViewController
                 mSearchbar.setHintTextColor(ColorUtils.blendARGB(helperMethod.invertedShadeColor(mColor,0.10f), Color.BLACK, 0.2f));
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    mContext.getWindow().setStatusBarColor(Color.parseColor(pTheme));
+                    //mContext.getWindow().setStatusBarColor(Color.parseColor(pTheme));
                 }else {
-                    mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue));
+                    //mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue));
                 }
 
                 if(helperMethod.isColorDark(mColor)){
-                    mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                    //mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
                 }else {
-                    View decorView = mContext.getWindow().getDecorView(); //set status background black
-                    decorView.setSystemUiVisibility(decorView.getSystemUiVisibility() & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                    //View decorView = mContext.getWindow().getDecorView(); //set status background black
+                    //decorView.setSystemUiVisibility(decorView.getSystemUiVisibility() & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
                 }
                 mTopBarHider.setBackgroundColor(mColor);
             }
@@ -1071,10 +1110,10 @@ class homeViewController
                 mTopBar.setBackground(ContextCompat.getDrawable(mContext, R.color.c_background));
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.c_background));
+                    //mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.c_background));
                 }else {
-                    mContext.getWindow().setStatusBarColor(mContext.getResources().getColor(R.color.blue_dark));
-                    mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue));
+                    //mContext.getWindow().setStatusBarColor(mContext.getResources().getColor(R.color.blue_dark));
+                    //mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue));
                 }
 
                 GradientDrawable gradientDrawable1 = new GradientDrawable();
@@ -1106,10 +1145,10 @@ class homeViewController
                 }
 
                 if(status.sTheme != enums.Theme.THEME_DARK || (status.sDefaultNightMode && status.sTheme != enums.Theme.THEME_DEFAULT)){
-                    mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                    //mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
                 }else {
-                    View decorView = mContext.getWindow().getDecorView();
-                    decorView.setSystemUiVisibility(decorView.getSystemUiVisibility() & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                    //View decorView = mContext.getWindow().getDecorView();
+                    //decorView.setSystemUiVisibility(decorView.getSystemUiVisibility() & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
                 }
 
                 mTopBarHider.setBackground(ContextCompat.getDrawable(mContext, R.color.c_background));
@@ -1149,32 +1188,21 @@ class homeViewController
     {
         if(pStatus){
             if(mSearchEngineBar.getAlpha() == 0 || mSearchEngineBar.getVisibility() == View.GONE && mSplashScreen.getAlpha()<=0){
+                onUpdateStatusBarTheme(null, false);
                 mSearchEngineBar.animate().cancel();
-                mSearchEngineBar.setAlpha(0f);
+                mSearchEngineBar.setAlpha(1f);
                 mSearchEngineBar.animate().setDuration(delay).alpha(1);
                 mSearchEngineBar.setVisibility(View.VISIBLE);
-                onUpdateStatusBarTheme(null, false);
-
-                View child = mAppBar.getChildAt(0);
-                AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) child.getLayoutParams();
-                params.setScrollFlags(0);
             }
         }else {
-                View child = mAppBar.getChildAt(0);
-                AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) child.getLayoutParams();
-                params.setScrollFlags(1);
-                mAppBar.refreshDrawableState();
-                mAppBar.invalidate();
-
-                mSearchEngineBar.animate().setDuration(delay).alpha(0).withEndAction(() -> {
+                mEvent.invokeObserver(null, enums.etype.M_UPDATE_THEME);
+                mSearchEngineBar.animate().setDuration(delay).setStartDelay(0).alpha(0).withEndAction(() -> {
                 mSearchEngineBar.animate().cancel();
                 mSearchEngineBar.setAlpha(0f);
                 mSearchEngineBar.setVisibility(View.GONE);
-                mEvent.invokeObserver(null, enums.etype.M_UPDATE_THEME);
                 mEvent.invokeObserver(null, enums.etype.M_RESET_SUGGESTION);
             });
         }
-
     }
 
     private void triggerUpdateSearchBar(String url, boolean showProtocol, boolean pClearText){
@@ -1352,6 +1380,55 @@ class homeViewController
         });
     }
 
+    public void onHomeTabAnimation(List<Object> data, Object e_type){
+        mGeckoView.setPivotX(0);
+        mGeckoView.setPivotY(0);
+
+        if(mGeckoView.getAlpha()<1 || mGeckoView.getTranslationX()<0){
+            return;
+        }
+
+        ObjectAnimator scaleDown = ObjectAnimator.ofPropertyValuesHolder(mGeckoView,
+                PropertyValuesHolder.ofFloat("translationX", 0, helperMethod.pxFromDp(-50)));
+        mNewTabBlocker.setVisibility(View.VISIBLE);
+        ObjectAnimator alpha = ObjectAnimator.ofPropertyValuesHolder(mNewTabBlocker,
+                PropertyValuesHolder.ofFloat("alpha", 0, 1f));
+
+        scaleDown.setDuration(150);
+        alpha.setDuration(150);
+
+        scaleDown.start();
+        alpha.start();
+
+        scaleDown.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation, boolean isReverse) {
+                mEvent.invokeObserver(data, e_type);
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation, boolean isReverse) {
+            }
+
+            @Override
+            public void onAnimationStart(Animator animation) {
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+            }
+        });
+    }
+
     public void onResetTabAnimation(){
         mGeckoView.setPivotX(0);
         mGeckoView.setPivotY(0);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingController.java
deleted file mode 100755
index 1065b0c0..00000000
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.darkweb.genesissearchengine.appManager.landingManager;
-
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager.landingPageController;
-import com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager.landingPageDataModel;
-import com.darkweb.genesissearchengine.appManager.orbotManager.orbotController;
-import com.darkweb.genesissearchengine.constants.enums;
-import com.darkweb.genesissearchengine.eventObserver;
-import com.darkweb.genesissearchengine.pluginManager.pluginController;
-import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
-import com.example.myapplication.R;
-import com.github.paolorotolo.appintro.AppIntro;
-
-import java.util.Collections;
-import java.util.List;
-
-import static com.darkweb.genesissearchengine.appManager.landingManager.landingEnums.eLandingPageControllerCallbackCommands.M_ON_LANDING_PAGE_FINISH_TRIGGERED;
-
-public class landingController extends AppIntro {
-
-    /* Private Variables */
-
-    private landingViewController mLandingViewController;
-    private landingModelController mLandingModel;
-
-    /* UI Variables */
-
-    private landingPageController mIntro_welcome;
-    private landingPageController mIntro_intro;
-    private landingPageController mIntro_start;
-
-    /* Initializations */
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED);
-        super.onCreate(savedInstanceState);
-
-        initializePages();
-        initializeModels();
-    }
-
-    private void initializePages(){
-        mIntro_welcome = new landingPageController();
-        mIntro_intro = new landingPageController();
-        mIntro_start = new landingPageController();
-
-        mIntro_welcome.onInitialize(new landingPageCallback(), new landingPageDataModel(getString(R.string.LANDING_HELLO), getString(R.string.LANDING_WELCOME),null, enums.LandingPageTypes.M_LANDING_WELCOME));
-        mIntro_intro.onInitialize(new landingPageCallback(), new landingPageDataModel(getString(R.string.LANDING_BROWSE_INFO), getString(R.string.LANDING_NO_TRACKING),null, enums.LandingPageTypes.M_LANDING_INTRO));
-        mIntro_start.onInitialize(new landingPageCallback(), new landingPageDataModel(getString(R.string.LANDING_BRIDGES_INFO),null,getString(R.string.LANDING_MORE), enums.LandingPageTypes.M_LANDING_START));
-    }
-
-    private void initializeModels(){
-        mLandingViewController = new landingViewController(this,new landingViewCallback(), mIntro_welcome, mIntro_intro, mIntro_start);
-        mLandingModel = new landingModelController(this, new landingModelCallback());
-    }
-
-    /* Local Override */
-
-    @Override
-    public void onDonePressed(Fragment currentFragment) {
-        super.onDonePressed(currentFragment);
-        mLandingModel.onTrigger(landingEnums.eLandingModelCommands.M_UPDATE_LANDING_PAGE_SHOWN_STATUS);
-        onCloseTrigger();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-    }
-
-    /* Helper Methods */
-
-    public void onCloseTrigger(){
-        finish();
-    }
-
-    /* Callbacks */
-
-    private class landingViewCallback implements eventObserver.eventListener{
-
-        @Override
-        public Object invokeObserver(List<Object> pData, Object pType)
-        {
-            return null;
-        }
-    }
-
-    private class landingModelCallback implements eventObserver.eventListener{
-
-        @Override
-        public Object invokeObserver(List<Object> pData, Object pType)
-        {
-            return null;
-        }
-    }
-
-    private class landingPageCallback implements eventObserver.eventListener{
-
-        @Override
-        public Object invokeObserver(List<Object> pData, Object pType)
-        {
-            if(pType.equals(M_ON_LANDING_PAGE_FINISH_TRIGGERED)){
-                if((int)pData.get(0) == enums.LandingPageTypes.M_LANDING_START){
-                    startActivity(new Intent(landingController.this, orbotController.class));
-                }
-            }
-            return null;
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingEnums.java
deleted file mode 100644
index a71183d3..00000000
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingEnums.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.darkweb.genesissearchengine.appManager.landingManager;
-
-public class landingEnums
-{
-
-    public enum eLandingViewCommands {
-    }
-
-    public enum eLandingModelCommands {
-        M_UPDATE_LANDING_PAGE_SHOWN_STATUS
-    }
-
-    public enum eLandingModelCallbackCommands {
-    }
-
-    public enum eLandingPageControllerCallbackCommands {
-        M_ON_LANDING_PAGE_FINISH_TRIGGERED
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingModelController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingModelController.java
deleted file mode 100644
index 45dc0d72..00000000
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingModelController.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.darkweb.genesissearchengine.appManager.landingManager;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.darkweb.genesissearchengine.constants.keys;
-import com.darkweb.genesissearchengine.constants.status;
-import com.darkweb.genesissearchengine.dataManager.dataController;
-import com.darkweb.genesissearchengine.dataManager.dataEnums;
-import com.darkweb.genesissearchengine.eventObserver;
-
-import java.util.Arrays;
-
-public class landingModelController {
-
-    /* Private Variables */
-
-    private AppCompatActivity mContext;
-    private eventObserver.eventListener mEvent;
-
-    public landingModelController(AppCompatActivity pContext, eventObserver.eventListener pEvent){
-        this.mContext = pContext;
-        this.mEvent = pEvent;
-    }
-
-    private void onUpdateLandingPageStatus(){
-        status.sLandingPageStatus = true;
-        dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.sLandingPageStatus,true));
-    }
-
-
-    public Object onTrigger(landingEnums.eLandingModelCommands pCommands){
-
-        if(pCommands.equals(landingEnums.eLandingModelCommands.M_UPDATE_LANDING_PAGE_SHOWN_STATUS)){
-            onUpdateLandingPageStatus();
-        }
-
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingViewController.java
deleted file mode 100755
index bb7bf260..00000000
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingViewController.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.darkweb.genesissearchengine.appManager.landingManager;
-
-import androidx.core.content.ContextCompat;
-import com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager.landingPageController;
-import com.darkweb.genesissearchengine.eventObserver;
-import com.example.myapplication.R;
-import com.github.paolorotolo.appintro.AppIntro;
-
-class landingViewController
-{
-    /*Private Variables*/
-
-    private AppIntro mContext;
-    private eventObserver.eventListener mEvent;
-
-    /*UI Variables*/
-
-    private landingPageController mIntroWelcome;
-    private landingPageController mIntroIntro;
-    private landingPageController mIntroStart;
-
-    /*Initializations*/
-
-    landingViewController(AppIntro pContext, eventObserver.eventListener pEvent, landingPageController pIntroWelcome, landingPageController pIntroIntro, landingPageController pIntroStart){
-        this.mContext = pContext;
-        this.mEvent = pEvent;
-        this.mIntroWelcome = pIntroWelcome;
-        this.mIntroIntro = pIntroIntro;
-        this.mIntroStart = pIntroStart;
-
-        setUIData();
-        initPostUI();
-    }
-
-    private void setUIData(){
-        mContext.addSlide(mIntroWelcome);
-        mContext.addSlide(mIntroIntro);
-        mContext.addSlide(mIntroStart);
-
-        mContext.setBarColor(mContext.getResources().getColor(R.color.landing_ease_blue));
-        mContext.setSeparatorColor(mContext.getResources().getColor(R.color.headerblack));
-
-        mContext.showSkipButton(false);
-        mContext.setProgressButtonEnabled(true);
-    }
-
-    private void initPostUI(){
-        mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue));
-    }
-
-    public Object onTrigger(landingEnums.eLandingViewCommands pCommands){
-        return null;
-    }
-}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageController.java
deleted file mode 100644
index 6773dabd..00000000
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager;
-
-import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import com.darkweb.genesissearchengine.eventObserver;
-import com.example.myapplication.R;
-
-import java.util.Collections;
-import java.util.List;
-
-import static com.darkweb.genesissearchengine.appManager.landingManager.landingEnums.eLandingPageControllerCallbackCommands.M_ON_LANDING_PAGE_FINISH_TRIGGERED;
-
-
-public class landingPageController extends Fragment {
-
-    /*UI Variables*/
-
-    private TextView mHeader;
-    private TextView mSubHeader;
-    private TextView mSubmit;
-
-    /*Local Variables*/
-
-    private eventObserver.eventListener mEvent;
-    private landingPageDataModel mDataModel;
-    private landingPageViewController mLandingPageViewController;
-
-    /*Initializations*/
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-        View view = inflater.inflate(R.layout.landing_view, container, false);
-
-        initializeModels(view);
-        initializeLocalEventHandlers();
-        return view;
-
-    }
-
-    private void initializeModels(View pView){
-        mHeader = pView.findViewById(R.id.pHeader);
-        mSubHeader = pView.findViewById(R.id.pSubHeader);
-        mSubmit = pView.findViewById(R.id.pNextButton);
-
-        mLandingPageViewController = new landingPageViewController(this,new landingPageViewCallback(), mHeader, mSubHeader, mSubmit, mDataModel);
-    }
-
-    public landingPageController onInitialize(eventObserver.eventListener pEvent, landingPageDataModel pDataModel) {
-        landingPageController mSlidePage = new landingPageController();
-        Bundle args = new Bundle();
-
-        mDataModel = pDataModel;
-        mEvent = pEvent;
-
-        mSlidePage.setArguments(args);
-        return mSlidePage;
-    }
-
-
-    private void initializeLocalEventHandlers(){
-        mSubmit.setOnClickListener(v -> mEvent.invokeObserver(Collections.singletonList(mDataModel.getPageType()), M_ON_LANDING_PAGE_FINISH_TRIGGERED));
-    }
-
-    private class landingPageViewCallback implements eventObserver.eventListener{
-
-        @Override
-        public Object invokeObserver(List<Object> pData, Object pType)
-        {
-            return null;
-        }
-    }
-
-}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageDataModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageDataModel.java
deleted file mode 100644
index dee16cfd..00000000
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageDataModel.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager;
-
-
-public class landingPageDataModel {
-
-    private String mHeader;
-    private String mSubHeader;
-    private String mNextButtonText;
-    private int mLandingPageType;
-
-    public landingPageDataModel(String pHeader, String pSubHeader, String pNextButtonText, int pLandingPageType){
-        this.mHeader = pHeader;
-        this.mSubHeader = pSubHeader;
-        this.mNextButtonText = pNextButtonText;
-        this.mLandingPageType = pLandingPageType;
-    }
-
-    public String getHeader(){
-        return mHeader;
-    }
-    public String getSubHeader(){
-        return mSubHeader;
-    }
-    public String getNextButtonText(){
-        return mNextButtonText;
-    }
-    public int getPageType(){
-        return mLandingPageType;
-    }
-
-}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageViewController.java
deleted file mode 100644
index 156f8540..00000000
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageViewController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager;
-
-import android.view.View;
-import android.widget.TextView;
-import androidx.fragment.app.Fragment;
-
-import com.darkweb.genesissearchengine.constants.enums;
-import com.darkweb.genesissearchengine.eventObserver;
-import com.example.myapplication.R;
-
-public class landingPageViewController {
-
-    private Fragment mContext;
-    private TextView mHeader;
-    private TextView mSubHeader;
-    private TextView mSubmit;
-    private landingPageDataModel mLandingModel;
-
-    public landingPageViewController(Fragment pContext, eventObserver.eventListener pEvent, TextView pHeader, TextView pSubHeader, TextView pSubmit, landingPageDataModel pLandingModel){
-        this.mHeader = pHeader;
-        this.mSubHeader = pSubHeader;
-        this.mSubmit = pSubmit;
-        this.mContext = pContext;
-        this.mLandingModel = pLandingModel;
-
-        onInitializeView();
-    }
-
-    private void onInitializeView(){
-        if(this.mLandingModel.getPageType() == enums.LandingPageTypes.M_LANDING_WELCOME){
-            mHeader.setText(mLandingModel.getHeader());
-            mSubHeader.setText(mLandingModel.getSubHeader());
-            mSubHeader.setVisibility(View.VISIBLE);
-        }
-        else if(this.mLandingModel.getPageType() == enums.LandingPageTypes.M_LANDING_INTRO){
-            mHeader.setText(mLandingModel.getHeader());
-            mSubHeader.setText(mLandingModel.getSubHeader());
-            mSubHeader.setVisibility(View.VISIBLE);
-        }
-        else if(this.mLandingModel.getPageType() == enums.LandingPageTypes.M_LANDING_START){
-            mHeader.setText(mLandingModel.getHeader());
-            mSubHeader.setText(mLandingModel.getSubHeader());
-            mSubmit.setText(mLandingModel.getNextButtonText());
-            mSubHeader.setVisibility(View.VISIBLE);
-            mSubmit.setVisibility(View.VISIBLE);
-        }
-    }
-}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageAdapter.java
index 4f182bcc..7cc4d257 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageAdapter.java
@@ -72,8 +72,8 @@ public class languageAdapter extends RecyclerView.Adapter<languageAdapter.helpVi
 
         void bindListView(languageDataModel model) {
             boolean mIsDefaultSupported = true;
-            mHeader = itemView.findViewById(R.id.pHeader);
-            mDescription = itemView.findViewById(R.id.pDescription);
+            mHeader = itemView.findViewById(R.id.pOrbotRowHeader);
+            mDescription = itemView.findViewById(R.id.pOrbotRowDescription);
             mContainer = itemView.findViewById(R.id.pContainer);
             mMarker = itemView.findViewById(R.id.pMarker);
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageController.java
index 14b82ad5..4b2fcd69 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageController.java
@@ -86,7 +86,7 @@ public class languageController extends AppCompatActivity {
     {
         activityContextManager.getInstance().onStack(this);
         mRecycleView = findViewById(R.id.pRecycleView);
-        mBlocker = findViewById(R.id.pBlocker);
+        mBlocker = findViewById(R.id.pSecureRootBlocker);
 
         mLanguageViewController.initialization(new languageViewCallback(),this, mBlocker);
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogAdapter.java
index ef376154..5e3b6bb7 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogAdapter.java
@@ -53,28 +53,28 @@ public class orbotLogAdapter extends RecyclerView.Adapter<orbotLogAdapter.listVi
 
     /*View Holder Extensions*/
     class listViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        TextView mHeader;
-        TextView mDescription;
-        ConstraintLayout mRowContainerInner;
+        TextView mOrbotRowHeader;
+        TextView mOrbotRowDescription;
+        ConstraintLayout mOrbotRowContainer;
 
         listViewHolder(View itemView) {
             super(itemView);
         }
 
         void bindListView(logRowModel model) {
-            mHeader = itemView.findViewById(R.id.pHeader);
-            mDescription = itemView.findViewById(R.id.pDescription);
-            mRowContainerInner = itemView.findViewById(R.id.pRowContainerInner);
+            mOrbotRowHeader = itemView.findViewById(R.id.pOrbotRowHeader);
+            mOrbotRowDescription = itemView.findViewById(R.id.pOrbotRowDescription);
+            mOrbotRowContainer = itemView.findViewById(R.id.pOrbotRowContainer);
 
-            mHeader.setText((this.getLayoutPosition() + ". " + model.getLog()));
-            mDescription.setText(model.getDate());
-            mRowContainerInner.setOnClickListener(this);
+            mOrbotRowHeader.setText((this.getLayoutPosition() + ". " + model.getLog()));
+            mOrbotRowDescription.setText(model.getDate());
+            mOrbotRowContainer.setOnClickListener(this);
         }
 
         @Override
         public void onClick(View v) {
             Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(constants.CONST_LOG_DUCKDUCK + Uri.encode(" " + mModelList.get(this.getLayoutPosition()).getLog())));
-            intent.putExtra(SearchManager.QUERY, mDescription.getText());
+            intent.putExtra(SearchManager.QUERY, mOrbotRowDescription.getText());
             intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             activityContextManager.getInstance().getHomeController().startActivity(intent);
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java
index 7f6676ca..a253ae7e 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java
@@ -27,38 +27,38 @@ import com.darkweb.genesissearchengine.pluginManager.pluginController;
 import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
 import com.example.myapplication.R;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-
 import org.torproject.android.service.wrapper.logRowModel;
-import org.torproject.android.service.wrapper.orbotLocalConstants;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-
+import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogModelCallbackCommands.M_UPDATE_FLOATING_BUTTON;
+import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogModelCallbackCommands.M_UPDATE_LOGS;
+import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogModelCallbackCommands.M_UPDATE_RECYCLE_VIEW;
 import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogModelCommands.M_GET_LIST;
 import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogModelCommands.M_GET_LIST_SIZE;
 import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogViewCommands.M_FLOAT_BUTTON_UPDATE;
+import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogViewCommands.M_SCROLL_BOTTOM;
+import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogViewCommands.M_SCROLL_TOP;
+import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogViewCommands.M_SCROLL_TO_POSITION;
+import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogViewCommands.M_SHOW_FLOATING_TOOLBAR;
 
 
-public class orbotLogController extends AppCompatActivity {
+public class orbotLogController extends AppCompatActivity implements ViewTreeObserver.OnScrollChangedListener, ViewTreeObserver.OnGlobalLayoutListener {
 
     /* PRIVATE VARIABLES */
 
     private orbotLogModel mOrbotModel;
     private orbotLogViewController mOrbotLogViewController;
     private orbotLogAdapter mOrbotAdapter;
-    private boolean mActivityClosed = false;
-    private int mLogCounter = 1;
-    private boolean mIsRecycleviewInteracting = false;
 
     /* UI VARIABLES */
 
-    private TextView mLogs;
-    private RecyclerView mLogRecycleView;
-    private NestedScrollView mNestedScrollView;
-    private FloatingActionButton mFloatingScroller;
+    private TextView mOrbotLogLoadingText;
+    private RecyclerView mOrbotLogRecycleView;
+    private NestedScrollView mOrbotLogNestedScroll;
+    private FloatingActionButton mOrbotLogFloatingToolbar;
+    private boolean mIsRecycleviewInteracting = false;
 
     /* INITIALIZATIONS */
 
@@ -66,17 +66,22 @@ public class orbotLogController extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED);
-        overridePendingTransition(R.anim.push_anim_out_reverse, R.anim.push_anim_in_reverse);
         activityContextManager.getInstance().setOrbotLogController(this);
         activityContextManager.getInstance().onStack(this);
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.orbot_log_view);
+        initializeStartupAnimation();
 
         initializeViews();
         initializeLogs();
         initListener();
-        updateLogs();
+    }
+
+    public void initializeStartupAnimation(){
+        if(activityContextManager.getInstance().getHomeController().isSplashScreenLoading()){
+            overridePendingTransition(R.anim.translate_fade_left, R.anim.translate_fade_right);
+        }
     }
 
     @Override
@@ -87,242 +92,208 @@ public class orbotLogController extends AppCompatActivity {
             activityThemeManager.getInstance().onConfigurationChanged(this);
         }
 
-        mNestedScrollView.stopNestedScroll();
-
-        helperMethod.onDelayHandler(orbotLogController.this, 150, () -> {
-            if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE || newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
-                if(!orbotLogStatus.sUIInteracted && ((int)mOrbotModel.onTrigger(M_GET_LIST_SIZE)>1)){
-                    if(mNestedScrollView.canScrollVertically(enums.ScrollDirection.VERTICAL)){
-                        mNestedScrollView.stopNestedScroll();
-                        onScrollBottom();
-                        mNestedScrollView.stopNestedScroll();
-                        orbotLogStatus.sScrollPosition = -1;
-                    }
-                }else {
-                    mNestedScrollView.stopNestedScroll();
-                    mNestedScrollView.scrollTo(0,0);
-                    mNestedScrollView.smoothScrollTo(0,0);
-                    mNestedScrollView.stopNestedScroll();
-                    orbotLogStatus.sScrollPosition = 0;
-                }
-            }
-
-            return null;
-        });
+        mOrbotLogNestedScroll.stopNestedScroll();
+        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE || newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
+            initScrollPositionOnConfigurationChanged();
+        }
 
         super.onConfigurationChanged(newConfig);
     }
 
-    private void initializeViews() {
-        mLogRecycleView = findViewById(R.id.pLogRecycleView);
-        mLogs = findViewById(R.id.pLogs);
-        mNestedScrollView = findViewById(R.id.pNestedScrollView);
-        mFloatingScroller = findViewById(R.id.pFloatingScroller);
+    private void initScrollPositionOnConfigurationChanged(){
+        helperMethod.onDelayHandler(orbotLogController.this, 150, () -> {
+                if(!orbotLogStatus.sUIInteracted && ((int)mOrbotModel.onTrigger(M_GET_LIST_SIZE)>1)){
+                    if(mOrbotLogNestedScroll.canScrollVertically(enums.ScrollDirection.VERTICAL)){
+                        mOrbotLogViewController.onTrigger(M_SCROLL_BOTTOM);
+                        orbotLogStatus.sScrollPosition = -1;
+                        onScrollBottom();
+                    }
+                }else {
+                    mOrbotLogViewController.onTrigger(M_SCROLL_TOP);
+                    orbotLogStatus.sScrollPosition = 0;
+                }
+                return null;
+        });
+    }
 
-        mOrbotLogViewController = new orbotLogViewController(this, new orbotLogViewCallback() , mLogs, mLogRecycleView, mNestedScrollView, mFloatingScroller);
-        mOrbotModel = new orbotLogModel();
+    private void initializeViews() {
+        mOrbotLogRecycleView = findViewById(R.id.pOrbotLogRecycleView);
+        mOrbotLogLoadingText = findViewById(R.id.pOrbotLogLoadingText);
+        mOrbotLogNestedScroll = findViewById(R.id.pOrbotLogNestedScroll);
+        mOrbotLogFloatingToolbar = findViewById(R.id.pOrbotLogFloatingToolbar);
+
+        mOrbotLogViewController = new orbotLogViewController(this, new orbotLogViewCallback() , mOrbotLogLoadingText, mOrbotLogRecycleView, mOrbotLogNestedScroll, mOrbotLogFloatingToolbar);
+        mOrbotModel = new orbotLogModel(this, new orbotModelCallback());
     }
 
     private void initializeLogs(){
-        mLogCounter = 0;
-        mOrbotModel.setList(orbotLocalConstants.mTorLogsHistory);
         if(status.sLogThemeStyleAdvanced){
-            mLogCounter = (int)mOrbotModel.onTrigger(M_GET_LIST_SIZE);
-            LinearLayoutManager layoutManager = new LinearLayoutManager(orbotLogController.this);
             orbotLogAdapter adapter = new orbotLogAdapter(((ArrayList)mOrbotModel.onTrigger(M_GET_LIST)),new orbotLogController.orbotModelCallback());
             mOrbotAdapter = adapter;
-            layoutManager.setReverseLayout(true);
-
-            mLogRecycleView.setAdapter(adapter);
-            Objects.requireNonNull(mLogRecycleView.getItemAnimator()).setAddDuration(350);
-
-            mLogRecycleView.setNestedScrollingEnabled(false);
-            mLogRecycleView.setLayoutManager(new LinearLayoutManager(orbotLogController.this));
 
+            Objects.requireNonNull(mOrbotLogRecycleView.getItemAnimator()).setAddDuration(350);
+            mOrbotLogRecycleView.setAdapter(adapter);
+            mOrbotLogRecycleView.setNestedScrollingEnabled(false);
+            mOrbotLogRecycleView.setLayoutManager(new LinearLayoutManager(orbotLogController.this));
             mOrbotAdapter.notifyDataSetChanged();
 
         }else {
             logToString();
         }
         mOrbotLogViewController.onTrigger(orbotLogEnums.eOrbotLogViewCommands.M_INIT_VIEWS, Collections.singletonList(status.sLogThemeStyleAdvanced));
-        mLogRecycleView.smoothScrollToPosition((int)mOrbotModel.onTrigger(M_GET_LIST_SIZE));
+        mOrbotLogRecycleView.smoothScrollToPosition((int)mOrbotModel.onTrigger(M_GET_LIST_SIZE));
     }
 
 
     /* LISTENERS */
 
-    @RequiresApi(api = Build.VERSION_CODES.M)
+    @Override
+    public void onGlobalLayout() {
+        if(orbotLogStatus.sOrientation==-1){
+            orbotLogStatus.sOrientation = getResources().getConfiguration().orientation;
+        }
+
+        if(orbotLogStatus.sOrientation != getResources().getConfiguration().orientation && orbotLogStatus.sScrollPosition!=-1 && orbotLogStatus.sScrollPosition!=0){
+            orbotLogStatus.sScrollPosition = 0;
+            orbotLogStatus.sOrientation = getResources().getConfiguration().orientation;
+
+            mOrbotLogNestedScroll.stopNestedScroll();
+            mOrbotLogViewController.onTrigger(M_SCROLL_TO_POSITION, Collections.singletonList(orbotLogStatus.sScrollPosition));
+        }else {
+            if(orbotLogStatus.sScrollPosition!=-1 && orbotLogStatus.sUIInteracted){
+                mOrbotLogViewController.onTrigger(M_SCROLL_TO_POSITION, Collections.singletonList(orbotLogStatus.sScrollPosition));
+            }else if(mOrbotLogNestedScroll.canScrollVertically(enums.ScrollDirection.VERTICAL)){
+                if(orbotLogStatus.sScrollPosition==-1){
+                    onScrollBottom();
+                }else {
+                    mOrbotLogViewController.onTrigger(M_SCROLL_TO_POSITION, Collections.singletonList((int)(mOrbotModel.onTrigger(M_GET_LIST_SIZE))*100));
+                }
+            }
+        }
+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            mOrbotLogNestedScroll.setOnScrollChangeListener((View.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+                orbotLogStatus.sScrollPosition = scrollY;
+                if(!mOrbotLogNestedScroll.canScrollVertically(1)){
+                    orbotLogStatus.sScrollPosition = -1;
+                }
+            });
+        }
+
+        Log.i("SUPERFUCK1","1");
+        mOrbotLogViewController.onTrigger(M_FLOAT_BUTTON_UPDATE);
+        mOrbotLogRecycleView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+        orbotLogStatus.sOrientation = getResources().getConfiguration().orientation;
+    }
+
+    @Override
+    public void onScrollChanged() {
+        if (mOrbotLogNestedScroll.getChildAt(0).getBottom() <= (mOrbotLogNestedScroll.getHeight() + mOrbotLogNestedScroll.getScrollY())) {
+            Log.i("SUPERFUCK1","2");
+            mOrbotLogViewController.onTrigger(M_FLOAT_BUTTON_UPDATE);
+            if(!mIsRecycleviewInteracting){
+                Log.i("asdjaslkdjlasd","asd");
+                orbotLogStatus.sUIInteracted = false;
+            }
+        }
+       else  if(mOrbotLogNestedScroll.getScrollY() == 0){
+            Log.i("SUPERFUCK1111","2");
+            helperMethod.onDelayHandler(orbotLogController.this, 300, () -> {
+                if(mOrbotLogNestedScroll.getScrollY() == 0){
+                    mOrbotLogViewController.onTrigger(M_SHOW_FLOATING_TOOLBAR);
+                }
+                return null;
+            });
+        }
+    }
+
+
+    public void onScrollStateChange(RecyclerView recyclerView, int newState){
+        if (!recyclerView.canScrollVertically(1) && newState==RecyclerView.SCROLL_STATE_IDLE) {
+            mOrbotLogViewController.onTrigger(M_FLOAT_BUTTON_UPDATE);
+        }
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     private void initListener(){
 
-        mLogRecycleView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @SuppressLint("NewApi") @SuppressWarnings("deprecation")
-            @Override
-            public void onGlobalLayout() {
+        mOrbotLogRecycleView.getViewTreeObserver().addOnGlobalLayoutListener(this);
 
-                if(orbotLogStatus.sOrientation==-1){
-                    orbotLogStatus.sOrientation = getResources().getConfiguration().orientation;
-                }
+        mOrbotLogNestedScroll.getViewTreeObserver().addOnScrollChangedListener(this);
 
-                if(orbotLogStatus.sOrientation != getResources().getConfiguration().orientation && orbotLogStatus.sScrollPosition!=-1 && orbotLogStatus.sScrollPosition!=0){
-                    mNestedScrollView.stopNestedScroll();
-                    orbotLogStatus.sScrollPosition = 0;
-                    mNestedScrollView.scrollTo(0, orbotLogStatus.sScrollPosition);
-                    orbotLogStatus.sOrientation = getResources().getConfiguration().orientation;
-                }else {
-                    if(orbotLogStatus.sScrollPosition!=-1 && orbotLogStatus.sUIInteracted){
-                        mNestedScrollView.scrollTo(0, orbotLogStatus.sScrollPosition);
-                    }else if(mNestedScrollView.canScrollVertically(enums.ScrollDirection.VERTICAL)){
-                        onScrollBottom();
-                    }
-                }
-
-                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-                    mNestedScrollView.setOnScrollChangeListener((View.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
-                        orbotLogStatus.sScrollPosition = scrollY;
-                    });
-                }
-
-                mOrbotLogViewController.onTrigger(M_FLOAT_BUTTON_UPDATE);
-                mLogRecycleView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                orbotLogStatus.sOrientation = getResources().getConfiguration().orientation;
-            }
-        });
-
-        mLogRecycleView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+        mOrbotLogRecycleView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
                 super.onScrollStateChanged(recyclerView, newState);
-                if (!recyclerView.canScrollVertically(1) && newState==RecyclerView.SCROLL_STATE_IDLE) {
-                    mOrbotLogViewController.onTrigger(M_FLOAT_BUTTON_UPDATE);
-                }
+                onScrollStateChange(recyclerView, newState);
             }
         });
 
-        mLogRecycleView.setOnTouchListener((v, event) -> onTouch(event));
+        mOrbotLogRecycleView.setOnTouchListener((v, event) -> onTouch(event));
 
-        mNestedScrollView.setOnTouchListener((v, event) -> onTouch(event));
+        mOrbotLogNestedScroll.setOnTouchListener((v, event) -> onTouch(event));
 
-        mLogRecycleView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
-                if (!recyclerView.canScrollVertically(1) && newState==RecyclerView.SCROLL_STATE_IDLE) {
-                    mOrbotLogViewController.onTrigger(M_FLOAT_BUTTON_UPDATE);
-                }
-            }
-        });
-
-        mNestedScrollView.getViewTreeObserver() .addOnScrollChangedListener(() -> {
-
-            if (mNestedScrollView.getChildAt(0).getBottom() <= (mNestedScrollView.getHeight() + mNestedScrollView.getScrollY())) {
-                mOrbotLogViewController.onTrigger(M_FLOAT_BUTTON_UPDATE);
-                if(!mIsRecycleviewInteracting){
-                    orbotLogStatus.sUIInteracted = false;
-                }
-            }
-            if(mNestedScrollView.getScrollY() == 0){
-                mOrbotLogViewController.onTrigger(M_FLOAT_BUTTON_UPDATE);
-            }
-        });
     }
 
+    /* Helper Methods */
+
     public boolean onTouch(MotionEvent event){
         if(event.getAction() == MotionEvent.ACTION_UP){
             mIsRecycleviewInteracting = false;
 
-            if(mNestedScrollView.canScrollVertically(enums.ScrollDirection.VERTICAL)){
+            if(mOrbotLogNestedScroll.canScrollVertically(enums.ScrollDirection.VERTICAL)){
+                Log.i("asdjaslkdjlasd","asd3");
                 orbotLogStatus.sUIInteracted = true;
             }
-        }else if(event.getAction() == MotionEvent.ACTION_DOWN){
+        }else if(event.getAction() == MotionEvent.ACTION_DOWN || event.getAction() == MotionEvent.ACTION_MOVE){
             mIsRecycleviewInteracting = true;
         }
 
+        Log.i("SUPERFUCK1","5");
         mOrbotLogViewController.onTrigger(M_FLOAT_BUTTON_UPDATE);
 
         return false;
     }
 
+
     private void logToString(){
         if((int)mOrbotModel.onTrigger(M_GET_LIST_SIZE)>1){
             for(int mCounter=0;mCounter<(int)mOrbotModel.onTrigger(M_GET_LIST_SIZE);mCounter++){
                 mOrbotLogViewController.onTrigger(orbotLogEnums.eOrbotLogViewCommands.M_UPDATE_LOGS, Collections.singletonList(((ArrayList<logRowModel>)mOrbotModel.onTrigger(M_GET_LIST)).get(mCounter).getLog()));
-                mLogCounter+=1;
             }
         }
     }
 
-    private void updateLogs(){
-        new Thread(){
-            public void run(){
-                try {
-                sleep(1000);
-                while (!mActivityClosed){
-                        if(status.sLogThemeStyleAdvanced){
-                            sleep(800);
-                        }else {
-                            sleep(100);
-                        }
-
-                        if(mLogCounter>0){
-                            runOnUiThread(() -> {
-                                if(orbotLocalConstants.mTorLogsHistory.size()>mLogCounter){
-                                    ((ArrayList<logRowModel>)mOrbotModel.onTrigger(M_GET_LIST)).add(orbotLocalConstants.mTorLogsHistory.get(mLogCounter));
-                                    if(!status.sLogThemeStyleAdvanced){
-                                        mOrbotLogViewController.onTrigger(orbotLogEnums.eOrbotLogViewCommands.M_UPDATE_LOGS, Collections.singletonList(((ArrayList<logRowModel>)mOrbotModel.onTrigger(M_GET_LIST)).get(mLogCounter).getLog()));
-                                    }else {
-                                        if(mOrbotAdapter!=null){
-                                            mOrbotAdapter.notifyItemInserted((int)mOrbotModel.onTrigger(M_GET_LIST_SIZE)-1);
-                                        }
-                                    }
-
-                                    if(!orbotLogStatus.sUIInteracted){
-                                        helperMethod.onDelayHandler(orbotLogController.this, 150, () -> {
-                                            Log.i("SUPFUCK4", orbotLogStatus.sUIInteracted + "");
-                                            if(!orbotLogStatus.sUIInteracted){
-                                                onScrollBottomAnimated(null);
-                                            }
-                                            return null;
-                                        });
-                                    }
-                                    mLogCounter+=1;
-                                }
-                            });
-                        }
-                    }
-                }
-                catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }.start();
-    }
-
     private void onScrollBottom() {
-        mNestedScrollView.scrollTo(0,helperMethod.pxFromDp((int)mOrbotModel.onTrigger(M_GET_LIST_SIZE)*100));
+        mOrbotLogNestedScroll.scrollTo(0,helperMethod.pxFromDp((int)mOrbotModel.onTrigger(M_GET_LIST_SIZE)*100));
     }
 
     /* View Callback */
 
-    public void onScrollBottomAnimated(View view) {
-        mNestedScrollView.fullScroll(View.FOCUS_DOWN);
-        orbotLogStatus.sUIInteracted = false;
-        Log.i("SUPFUCK5", orbotLogStatus.sUIInteracted + "");
-
-        if(view!=null){
-            mOrbotLogViewController.onTrigger(M_FLOAT_BUTTON_UPDATE);
+    public void onUITriggered(View view){
+        if(view.getId() == R.id.pOrbotLogFloatingToolbar){
+            if(!orbotLogStatus.sUIInteracted || view!=null){
+                onScrollDownByFloatingToolabar();
+            }
+            if(view!=null){
+                mOrbotLogViewController.onTrigger(M_FLOAT_BUTTON_UPDATE);
+            }
+        }else if(view.getId() == R.id.pOrbotLogSettings){
+            helperMethod.openActivity(settingLogController.class, constants.CONST_LIST_HISTORY, this,true);
         }
     }
 
-    public void onOpenInfo(View view) {
-        helperMethod.openActivity(settingLogController.class, constants.CONST_LIST_HISTORY, this,true);
+    public void onScrollDownByFloatingToolabar(){
+        if(!mIsRecycleviewInteracting){
+            orbotLogStatus.sUIInteracted = false;
+            mOrbotLogNestedScroll.fullScroll(View.FOCUS_DOWN);
+        }
     }
 
-    public void onClose(View view){
+    public void onCloseTriggered(View view){
         finish();
         activityContextManager.getInstance().onRemoveStack(this);
-        overridePendingTransition(R.anim.push_anim_in, R.anim.push_anim_out);
-        mActivityClosed = true;
+        initializeStartupAnimation();
     }
 
     /* View Callback */
@@ -330,7 +301,7 @@ public class orbotLogController extends AppCompatActivity {
     private class orbotLogViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, Object e_type)
+        public Object invokeObserver(List<Object> pData, Object pType)
         {
             return null;
         }
@@ -340,8 +311,21 @@ public class orbotLogController extends AppCompatActivity {
 
     public class orbotModelCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, Object e_type)
+        public Object invokeObserver(List<Object> pData, Object pType)
         {
+            if(pType.equals(M_UPDATE_FLOATING_BUTTON)){
+                if(!orbotLogStatus.sUIInteracted){
+                    onScrollDownByFloatingToolabar();
+                }
+            }
+            else if(pType.equals(M_UPDATE_LOGS)){
+                mOrbotLogViewController.onTrigger(orbotLogEnums.eOrbotLogViewCommands.M_UPDATE_LOGS, Collections.singletonList(((ArrayList<logRowModel>)mOrbotModel.onTrigger(M_GET_LIST)).get((int)pData.get(0)).getLog()));
+            }
+            else if(pType.equals(M_UPDATE_RECYCLE_VIEW)){
+                if(mOrbotAdapter!=null){
+                    mOrbotAdapter.notifyItemInserted((int)pData.get(0));
+                }
+            }
             return null;
         }
     }
@@ -359,7 +343,7 @@ public class orbotLogController extends AppCompatActivity {
 
     @Override
     public void onBackPressed() {
-        onClose(null);
+        onCloseTriggered(null);
     }
 
     @Override
@@ -367,7 +351,6 @@ public class orbotLogController extends AppCompatActivity {
         super.onDestroy();
         activityContextManager.getInstance().onRemoveStack(this);
         activityContextManager.getInstance().setOrbotLogController(null);
-        mActivityClosed = true;
     }
 
     /* External Calls */
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogEnums.java
index 0b564893..c72e00b5 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogEnums.java
@@ -5,7 +5,7 @@ public class orbotLogEnums
     /*Orbot Log View Manager*/
 
     public enum eOrbotLogViewCommands {
-        M_UPDATE_LOGS, M_INIT_VIEWS, M_FLOAT_BUTTON_UPDATE
+        M_UPDATE_LOGS, M_INIT_VIEWS, M_FLOAT_BUTTON_UPDATE, M_SCROLL_TOP, M_SCROLL_BOTTOM, M_SCROLL_TO_POSITION, M_SHOW_FLOATING_TOOLBAR
     }
 
     /*Orbot Log Model Manager*/
@@ -13,4 +13,10 @@ public class orbotLogEnums
     public enum eOrbotLogModelCommands {
         M_GET_LIST, M_GET_LIST_SIZE
     }
+
+    /*Orbot Log Model Callback*/
+
+    public enum eOrbotLogModelCallbackCommands {
+        M_UPDATE_FLOATING_BUTTON, M_UPDATE_LOGS, M_UPDATE_RECYCLE_VIEW
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogModel.java
index 1be3fa6d..44f7fa17 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogModel.java
@@ -1,21 +1,51 @@
 package com.darkweb.genesissearchengine.appManager.orbotLogManager;
 
+import android.annotation.SuppressLint;
+import android.os.AsyncTask;
+import android.util.Log;
+
+import androidx.appcompat.app.AppCompatActivity;
 import com.darkweb.genesissearchengine.constants.constants;
+import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.eventObserver;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import org.torproject.android.service.wrapper.logRowModel;
-
+import org.torproject.android.service.wrapper.orbotLocalConstants;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogModelCallbackCommands.M_UPDATE_FLOATING_BUTTON;
+import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogModelCallbackCommands.M_UPDATE_LOGS;
+import static com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogEnums.eOrbotLogModelCallbackCommands.M_UPDATE_RECYCLE_VIEW;
+import static java.lang.Thread.sleep;
+import static org.mozilla.gecko.util.ThreadUtils.runOnUiThread;
 
 class orbotLogModel
 {
     /*Private Variables*/
 
     private ArrayList<logRowModel> mModelList = new ArrayList<>();
+    private AppCompatActivity mContext;
+    private eventObserver.eventListener mEvent;
+    private LogHandler mLogHandler;
+    private int mLogCounter;
 
     /*Helper Methods*/
 
-    void setList(ArrayList<logRowModel> pModel)
+    public orbotLogModel(AppCompatActivity pContext, eventObserver.eventListener pEvent){
+        this.mContext = pContext;
+        this.mEvent = pEvent;
+
+        initLogHandler();
+        this.initList(orbotLocalConstants.mTorLogsHistory);
+    }
+
+    private void initLogHandler(){
+        this.mLogHandler = new LogHandler();
+        this.mLogHandler.execute();
+    }
+
+    private void initList(ArrayList<logRowModel> pModel)
     {
         if(pModel.size()>0){
             mModelList.clear();
@@ -38,6 +68,58 @@ class orbotLogModel
 
     /*Triggers*/
 
+    public void onLoadLogs(){
+        new Thread(){
+            public void run(){
+            }
+        }.start();
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    class LogHandler extends AsyncTask<Void, Integer, Void> {
+        protected Void doInBackground(Void...arg0) {
+            try {
+                sleep(1000);
+                mLogCounter = mModelList.size();
+                while (!mContext.isDestroyed()){
+                    if(status.sLogThemeStyleAdvanced){
+                        sleep(800);
+                    }else {
+                        sleep(100);
+                    }
+
+                    if(mLogCounter>0){
+                        runOnUiThread(() -> {
+                            if(orbotLocalConstants.mTorLogsHistory.size()>mLogCounter){
+                                mModelList.add(orbotLocalConstants.mTorLogsHistory.get(mLogCounter));
+                                Log.i("asdasd : ",orbotLocalConstants.mTorLogsHistory.get(mLogCounter).getLog());
+                                if(!status.sLogThemeStyleAdvanced){
+                                    mEvent.invokeObserver(Collections.singletonList(mLogCounter), M_UPDATE_LOGS);
+                                }else {
+                                    mEvent.invokeObserver(Collections.singletonList(mModelList.size()-1), M_UPDATE_RECYCLE_VIEW);
+                                }
+
+                                if(!orbotLogStatus.sUIInteracted){
+                                    helperMethod.onDelayHandler(mContext, 150, () -> {
+                                        if(!orbotLogStatus.sUIInteracted){
+                                            mEvent.invokeObserver(null, M_UPDATE_FLOATING_BUTTON);
+                                        }
+                                        return null;
+                                    });
+                                }
+                                mLogCounter+=1;
+                            }
+                        });
+                    }
+                }
+            }
+            catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
     public void onTrigger(orbotLogEnums.eOrbotLogViewCommands pCommands, List<Object> pData){
     }
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogViewController.java
index cd3aa04a..076e64d6 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogViewController.java
@@ -1,16 +1,18 @@
 package com.darkweb.genesissearchengine.appManager.orbotLogManager;
 
+import android.os.Handler;
+import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.darkweb.genesissearchengine.constants.enums;
 import com.darkweb.genesissearchengine.eventObserver;
+import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import com.darkweb.genesissearchengine.helperManager.sharedUIMethod;
+import com.example.myapplication.R;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
 import java.util.List;
 
 class orbotLogViewController
@@ -20,32 +22,32 @@ class orbotLogViewController
     private AppCompatActivity mContext;
     private eventObserver.eventListener mEvent;
 
-    private TextView mLogs;
-    private RecyclerView mLogRecycleView;
-    private NestedScrollView mNestedScrollView;
-    private FloatingActionButton mFloatingScroller;
+    private TextView mOrbotLogLoadingText;
+    private RecyclerView mOrbotLogRecycleView;
+    private NestedScrollView mOrbotLogNestedScroll;
+    private FloatingActionButton mOrbotLogFloatingToolbar;
 
     /*Initializations*/
 
-    orbotLogViewController(AppCompatActivity pContext, eventObserver.eventListener pEvent, TextView pLogs, RecyclerView pLogRecycleView, NestedScrollView pNestedScrollView, FloatingActionButton pFloatingScroller)
+    orbotLogViewController(AppCompatActivity pContext, eventObserver.eventListener pEvent, TextView pOrbotLogLoadingText, RecyclerView pOrbotLogRecycleView, NestedScrollView pOrbotLogNestedScroll, FloatingActionButton pOrbotLogFloatingToolbar)
     {
         this.mContext = pContext;
-        this.mLogs = pLogs;
-        this.mLogRecycleView = pLogRecycleView;
-        this.mNestedScrollView = pNestedScrollView;
-        this.mFloatingScroller = pFloatingScroller;
         this.mEvent = pEvent;
+        this.mOrbotLogLoadingText = pOrbotLogLoadingText;
+        this.mOrbotLogRecycleView = pOrbotLogRecycleView;
+        this.mOrbotLogNestedScroll = pOrbotLogNestedScroll;
+        this.mOrbotLogFloatingToolbar = pOrbotLogFloatingToolbar;
 
         initPostUI();
     }
 
     private void initViews(boolean pLogThemeStyleAdvanced){
         if(pLogThemeStyleAdvanced){
-            mLogRecycleView.setVisibility(View.VISIBLE);
-            mLogs.setVisibility(View.GONE);
+            mOrbotLogRecycleView.setVisibility(View.VISIBLE);
+            mOrbotLogLoadingText.setVisibility(View.GONE);
         }else {
-            mLogRecycleView.setVisibility(View.GONE);
-            mLogs.setVisibility(View.VISIBLE);
+            mOrbotLogRecycleView.setVisibility(View.GONE);
+            mOrbotLogLoadingText.setVisibility(View.VISIBLE);
         }
     }
 
@@ -57,20 +59,38 @@ class orbotLogViewController
 
     private void onUpdateLogs(String pLogs){
         pLogs = "~ " + pLogs;
-        mLogs.setText(String.format("%s%s",mLogs.getText() , "\n\n" + pLogs ));
+        mOrbotLogLoadingText.setText(String.format("%s%s", mOrbotLogLoadingText.getText() , "\n\n" + pLogs ));
     }
 
     private void onFloatButtonUpdate(){
-        if(mNestedScrollView.canScrollVertically(enums.ScrollDirection.VERTICAL)){
-            mFloatingScroller.setVisibility(View.VISIBLE);
-            mFloatingScroller.animate().cancel();
-            mFloatingScroller.animate().setDuration(250).alpha(1);
+        if(mOrbotLogNestedScroll.canScrollVertically(enums.ScrollDirection.VERTICAL)){
+            mOrbotLogFloatingToolbar.setVisibility(View.VISIBLE);
+            mOrbotLogFloatingToolbar.animate().setDuration(250).alpha(1);
         }else {
-            mFloatingScroller.animate().cancel();
-            mFloatingScroller.animate().setDuration(250).alpha(0).withEndAction(() -> mFloatingScroller.setVisibility(View.GONE));
+            mOrbotLogFloatingToolbar.animate().cancel();
+            mOrbotLogFloatingToolbar.animate().setDuration(250).alpha(0).withEndAction(() -> mOrbotLogFloatingToolbar.setVisibility(View.GONE));
         }
     }
 
+    private void onShowFloatingToolbar(){
+        mOrbotLogFloatingToolbar.setVisibility(View.VISIBLE);
+        mOrbotLogFloatingToolbar.animate().setDuration(250).alpha(1);
+    }
+
+    private void onScrollToTop(){
+        mOrbotLogNestedScroll.stopNestedScroll();
+        mOrbotLogNestedScroll.scrollTo(0,0);
+        mOrbotLogNestedScroll.smoothScrollTo(0,0);
+    }
+
+    private void onScrollToBottom(){
+        mOrbotLogNestedScroll.stopNestedScroll();
+    }
+
+    private void onScrollToSize(int pSize){
+        mOrbotLogNestedScroll.stopNestedScroll();
+        mOrbotLogNestedScroll.scrollTo(0, pSize);
+    }
 
     /*Triggers*/
 
@@ -81,12 +101,23 @@ class orbotLogViewController
         else if(pCommands.equals(orbotLogEnums.eOrbotLogViewCommands.M_INIT_VIEWS)){
             initViews((boolean)pData.get(0));
         }
-        else if(pCommands.equals(orbotLogEnums.eOrbotLogViewCommands.M_FLOAT_BUTTON_UPDATE)){
-            onFloatButtonUpdate();
+        else if(pCommands.equals(orbotLogEnums.eOrbotLogViewCommands.M_SCROLL_TO_POSITION)){
+            onScrollToSize((int)pData.get(0));
         }
     }
 
     public void onTrigger(orbotLogEnums.eOrbotLogViewCommands pCommands){
-        onTrigger(pCommands, null);
+        if(pCommands.equals(orbotLogEnums.eOrbotLogViewCommands.M_SCROLL_TOP)){
+            onScrollToTop();
+        }
+        else if(pCommands.equals(orbotLogEnums.eOrbotLogViewCommands.M_SCROLL_BOTTOM)){
+            onScrollToBottom();
+        }
+        else if(pCommands.equals(orbotLogEnums.eOrbotLogViewCommands.M_FLOAT_BUTTON_UPDATE)){
+            onFloatButtonUpdate();
+        }
+        else if(pCommands.equals(orbotLogEnums.eOrbotLogViewCommands.M_SHOW_FLOATING_TOOLBAR)){
+            onShowFloatingToolbar();
+        }
     }
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java
index 6538cb62..dc1b34ba 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java
@@ -42,10 +42,10 @@ public class orbotController extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED);
-        overridePendingTransition(R.anim.push_anim_in, R.anim.push_anim_out);
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.orbot_settings_view);
+        initializeStartupAnimation();
 
         if(!status.mThemeApplying){
             activityContextManager.getInstance().onStack(this);
@@ -111,8 +111,14 @@ public class orbotController extends AppCompatActivity {
 
     public void onClose(View view){
         finish();
+        initializeStartupAnimation();
         activityContextManager.getInstance().onRemoveStack(this);
-        overridePendingTransition(R.anim.push_anim_out_reverse, R.anim.push_anim_in_reverse);
+    }
+
+    public void initializeStartupAnimation(){
+        if(activityContextManager.getInstance().getHomeController().isSplashScreenLoading()){
+            overridePendingTransition(R.anim.translate_fade_left_reverse, R.anim.translate_fade_right_reverse);
+        }
     }
 
     /* LOCAL OVERRIDES */
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/proxyStatusManager/proxyStatusController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/proxyStatusManager/proxyStatusController.java
index 3ce87c39..98f50aeb 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/proxyStatusManager/proxyStatusController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/proxyStatusManager/proxyStatusController.java
@@ -38,7 +38,7 @@ public class proxyStatusController extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED);
-        overridePendingTransition(R.anim.push_anim_in, R.anim.push_anim_out);
+        overridePendingTransition(R.anim.popup_scale_in, R.anim.popup_scale_out);
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.proxy_status_view);
@@ -88,7 +88,7 @@ public class proxyStatusController extends AppCompatActivity {
     public void onClose(View view){
         finish();
         activityContextManager.getInstance().onRemoveStack(this);
-        overridePendingTransition(R.anim.push_anim_out_reverse, R.anim.push_anim_in_reverse);
+        overridePendingTransition(R.anim.popup_scale_in, R.anim.popup_scale_out);
     }
 
     /* LOCAL OVERRIDES */
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceController.java
index 06c1074e..8d11eb5d 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceController.java
@@ -1,5 +1,8 @@
 package com.darkweb.genesissearchengine.appManager.settingManager.advanceManager;
 
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_IMAGE_UPDATE;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_UPDATE_BOOKMARK;
+
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.View;
@@ -155,11 +158,16 @@ public class settingAdvanceController extends AppCompatActivity {
     }
 
     public void onShowImages(View view) {
+        if(status.sShowImages == 0 && view.getId() == R.id.pAdvanceOption2 && !mImageOption.get(1).isChecked() || status.sShowImages == 2 && view.getId() == R.id.pAdvanceOption1 && !mImageOption.get(0).isChecked()){
+            pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_IMAGE_UPDATE);
+        }
+
         mIsChanged = true;
         mSettingAdvanceViewController.onTrigger(settingAdvanceEnums.eAdvanceViewController.M_CLEAR_IMAGE, Collections.singletonList(null));
         mSettingAdvanceModel.onTrigger(settingAdvanceEnums.eAdvanceModel.M_SHOW_IMAGE, Collections.singletonList(view));
         mSettingAdvanceViewController.onTrigger(settingAdvanceEnums.eAdvanceViewController.M_SET_IMAGE, Collections.singletonList(view));
         dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_SHOW_IMAGES,status.sShowImages));
+
     }
 
     public void onGridView(View view) {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java
index 6b547a90..e4d8806c 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java
@@ -234,6 +234,7 @@ public class settingClearController extends AppCompatActivity {
             status.mThemeApplying = true;
             onBackPressed();
             overridePendingTransition(R.anim.fade_in_lang, R.anim.fade_out_lang);
+            activityContextManager.getInstance().getHomeController().onResetData();
             activityContextManager.getInstance().getHomeController().onReInitTheme();
             activityContextManager.getInstance().getSettingController().onReInitTheme();
             helperMethod.openActivity(settingClearController.class, constants.CONST_LIST_HISTORY, settingClearController.this, true);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralController.java
index b20584a7..2f046153 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralController.java
@@ -1,8 +1,6 @@
 package com.darkweb.genesissearchengine.appManager.settingManager.generalManager;
 
-import android.content.Context;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.View;
@@ -13,7 +11,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
 import com.darkweb.genesissearchengine.appManager.helpManager.helpController;
-import com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController;
 import com.darkweb.genesissearchengine.appManager.languageManager.languageController;
 import com.darkweb.genesissearchengine.constants.constants;
 import com.darkweb.genesissearchengine.constants.enums;
@@ -31,9 +28,6 @@ import com.google.android.material.switchmaterial.SwitchMaterial;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
-
-import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_APPLICATION_CRASH;
 
 public class settingGeneralController extends AppCompatActivity {
 
@@ -100,7 +94,7 @@ public class settingGeneralController extends AppCompatActivity {
 
     private void viewsInitializations() {
 
-        mFullScreenMode = findViewById(R.id.pJSStatus);
+        mFullScreenMode = findViewById(R.id.pSecureJavascriptStatus);
         mThemeLight = findViewById(R.id.pThemeLight);
         mThemeDark = findViewById(R.id.pThemeDark);
         mThemeDefault = findViewById(R.id.pThemeDefault);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java
index f3f8886d..ac6ba3d9 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java
@@ -91,7 +91,7 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
     {
         holder.bindListView(mModelList.get(position));
         holder.itemView.setTag(position);
-        holder.itemView.findViewById(R.id.pRemoveRow).setTag(position);
+        holder.itemView.findViewById(R.id.pOrbotRowRemove).setTag(position);
         holder.itemView.findViewById(R.id.pLoadSession).setTag(position);
 
         if(position == 0 && status.sTabGridLayoutEnabled && !mViewLoaded){
@@ -268,10 +268,10 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
         }
 
         void bindListView(tabRowModel model) {
-            mHeader = itemView.findViewById(R.id.pHeader);
-            mDescription = itemView.findViewById(R.id.pDescription);
+            mHeader = itemView.findViewById(R.id.pOrbotRowHeader);
+            mDescription = itemView.findViewById(R.id.pOrbotRowDescription);
             mLoadSession = itemView.findViewById(R.id.pLoadSession);
-            mRemoveRow = itemView.findViewById(R.id.pRemoveRow);
+            mRemoveRow = itemView.findViewById(R.id.pOrbotRowRemove);
             mWebThumbnail = itemView.findViewById(R.id.pWebThumbnail);
             mDate = itemView.findViewById(R.id.pDate);
             mSelectedView = itemView.findViewById(R.id.pSelectedView);
@@ -340,6 +340,15 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
                     mHeader.setText("about:blank");
                 }
 
+                if(mHeadText.startsWith("resource")){
+                    if(mHeadText.equals(CONST_GENESIS_URL_CACHED) || mHeadText.equals(CONST_GENESIS_URL_CACHED_DARK)){
+                        mHeader.setText(CONST_GENESIS_DOMAIN_URL);
+                    }
+                    else if(mHeadText.equals(CONST_GENESIS_HELP_URL_CACHE) || mHeadText.equals(CONST_GENESIS_HELP_URL_CACHE_DARK)){
+                        mHeader.setText(CONST_GENESIS_HELP_URL);
+                    }
+                }
+
                 if(mDescText.equals("$TITLE") || mDescText.startsWith("http://loading") || mDescText.startsWith("loading")){
                     mDescription.setText(mURL);
                 }
@@ -388,7 +397,7 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
                 }
 
             if(status.sTabGridLayoutEnabled){
-                CardView mLayout = itemView.findViewById(R.id.pRowContainerInner);
+                CardView mLayout = itemView.findViewById(R.id.pTABRowContainer);
                 CardView mCardView = itemView.findViewById(R.id.pCardViewParent);
                 ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mLayout.getLayoutParams();
 
@@ -477,7 +486,7 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
                     onSelectionClear(mSelectedView);
                     notifyItemChanged(mModelList.size()-1);
                 }
-            }else if(v.getId() == R.id.pRemoveRow){
+            }else if(v.getId() == R.id.pOrbotRowRemove){
                 v.setEnabled(false);
                 onRemoveRowCross(this.getLayoutPosition());
             }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
index a00826da..75957682 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
@@ -198,7 +198,7 @@ public class tabController extends Fragment
         mClearSelection = mRootView.findViewById(R.id.pClearSelection);
         mPopupUndo = mRootView.findViewById(R.id.pPopupUndo);
         mSelectionCount = mRootView.findViewById(R.id.pSelectionCount);
-        mBlocker = mRootView.findViewById(R.id.pBlocker);
+        mBlocker = mRootView.findViewById(R.id.pSecureRootBlocker);
         mNestedScrollView = mRootView.findViewById(R.id.pNestedScroll);
         mNewTab = mRootView.findViewById(R.id.pNewTab);
 
@@ -234,7 +234,10 @@ public class tabController extends Fragment
             float scrollY = mNestedScrollView.getScrollY();
 
             minScroll = scrollY;
-            int orientation = mContextManager.getHomeController().getResources().getConfiguration().orientation;
+            if(activityContextManager.getInstance().getHomeController()==null){
+                return;
+            }
+            int orientation = activityContextManager.getInstance().getHomeController().getResources().getConfiguration().orientation;
             if (orientation == Configuration.ORIENTATION_PORTRAIT) {
                 maxScroll = mRecycleView.computeVerticalScrollRange() - mScreenHeight*0.350f + helperMethod.pxFromDp(helperMethod.getNavigationBarSize(getContext()).y);
             } else {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java
index 472fca56..c537d314 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java
@@ -66,8 +66,9 @@ public class constants
 
     /*MENU CONSTANTS*/
 
-    public static final int CONST_LIST_HISTORY = 1;
-    public static final int CONST_LIST_BOOKMARK = 2;
+    public static final int CONST_LIST_EXTERNAL_SHORTCUT = 1;
+    public static final int CONST_LIST_HISTORY = 2;
+    public static final int CONST_LIST_BOOKMARK = 3;
 
     /*SETTINGS CONSTANTS*/
 
@@ -105,5 +106,10 @@ public class constants
     public static final String CONST_ENCRYPTION_KEY = "Zr4u7x!A%D*F-JaNdRgUkXp2s5v8y/B?";
     public static final String CONST_ENCRYPTION_KEY_DATABASE = "Zr4u7x!!A%D*F-JaNdsS@@gUbbp^^5v8y/B?";
 
+    /*SHORTCUT CONSTANTS*/
+    public static final String CONST_EXTERNAL_SHORTCUT_COMMAND_ERASE = "EXTERNAL_SHORTCUT_COMMAND_ERASE";
+    public static final String CONST_EXTERNAL_SHORTCUT_COMMAND_ERASE_OPEN = "EXTERNAL_SHORTCUT_COMMAND_ERASE_OPEN";
+    public static final String CONST_EXTERNAL_SHORTCUT_COMMAND_RESTART = "EXTERNAL_SHORTCUT_COMMAND_RESTART";
+    public static final String CONST_EXTERNAL_SHORTCUT_COMMAND_NAVIGATE = "EXTERNAL_SHORTCUT_COMMAND_NAVIGATE";
 
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java
index 0e6d43e0..49736dcb 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java
@@ -8,7 +8,7 @@ public class enums
         on_verify_selected_url_menu,FINDER_RESULT_CALLBACK,M_ADMOB_BANNER_RECHECK,M_OPEN_SESSION,M_DOWNLOAD_FAILURE, M_ADVERT_LOADED,
         welcome, reload,download_folder, M_UPDATE_THEME,M_ON_BANNER_UPDATE, M_LOAD_HOMEPAGE_GENESIS,M_INIT_TAB_COUNT_FORCED,M_SPLASH_DISABLE,M_NEW_LINK_IN_NEW_TAB,M_RESET_SUGGESTION,
         url_triggered, url_triggered_new_tab,url_clear,fetch_favicon,M_OPEN_BOOKMARK_SETTING, M_COPY_URL,url_clear_at,remove_from_database,is_empty,M_HOME_PAGE,M_PRELOAD_URL,ON_KEYBOARD_CLOSE,M_CLOSE_TAB,
-        on_close_sesson,on_long_press, on_full_screen,on_handle_external_intent,on_update_suggestion_url,progress_update,progress_update_forced, ON_EXPAND_TOP_BAR,recheck_orbot,on_url_load,on_playstore_load,back_list_empty,start_proxy, ON_UPDATE_THEME, M_NEW_IDENTITY, M_NEW_IDENTITY_MESSAGED, M_INITIALIZE_TAB_SINGLE, M_INITIALIZE_TAB_LINK,on_request_completed, on_update_history,on_update_suggestion,M_WELCOME_MESSAGE,ON_FIRST_PAINT, ON_LOAD_TAB_ON_RESUME, ON_SESSION_REINIT,on_page_loaded,on_load_error, M_ORBOT_LOADING,download_file_popup,on_init_ads, M_GET_CURRENT_URL,search_update, open_new_tab,open_new_tab_instant
+        on_close_sesson,on_long_press, on_full_screen,on_handle_external_intent,on_update_suggestion_url,progress_update,progress_update_forced, ON_EXPAND_TOP_BAR,recheck_orbot,on_url_load,on_playstore_load,back_list_empty,start_proxy, ON_UPDATE_THEME, M_NEW_IDENTITY, M_NEW_IDENTITY_MESSAGED, M_INITIALIZE_TAB_SINGLE, M_HOME_BUTTON_PRESSED, M_INITIALIZE_TAB_LINK,on_request_completed, on_update_history,on_update_suggestion,M_WELCOME_MESSAGE,ON_FIRST_PAINT, ON_LOAD_TAB_ON_RESUME, ON_SESSION_REINIT,on_page_loaded,on_load_error, M_ORBOT_LOADING,download_file_popup,on_init_ads, M_GET_CURRENT_URL,search_update, open_new_tab,open_new_tab_instant
     }
 
     /*General Enums*/
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
index d2910c16..7f1c414a 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
@@ -5,6 +5,7 @@ public class keys
     /*GENERIC*/
 
     public static final String M_ACTIVITY_RESPONSE = "M_ACTIVITY_RESPONSE";
+    public static final String M_ACTIVITY_NAVIGATION_BUNDLE_KEY = "M_ACTIVITY_NAVIGATION_BUNDLE_KEY";
 
     /*Home page*/
 
@@ -77,10 +78,9 @@ public class keys
     public static final String BOOKMARK_SETTING_URL = "BOOKMARK_SETTING_URL";
     public static final String BOOKMARK_SETTING_ID = "BOOKMARK_SETTING_ID";
 
-    /*Landing Settings*/
-    public static final String LANDING_TITLE_KEY = "LANDING_TITLE_KEY";
-    public static final String LANDING_SUB_TITLE_KEY = "LANDING_SUB_TITLE_KEY";
-    public static final String LANDING_SUBMIT_KEY = "LANDING_SUBMIT_KEY";
-    public static final String LANDING_LAYOUT_RESID = "LANDING_LAYOUT_RESID";
+    /*External Shortcut Settings*/
+    public static final String EXTERNAL_SHORTCUT_COMMAND = "EXTERNAL_SHORTCUT_COMMAND";
+    public static final String EXTERNAL_SHORTCUT_COMMAND_NAVIGATE = "EXTERNAL_SHORTCUT_COMMAND";
+
 
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/imageDataModel.java b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/imageDataModel.java
index a9fb7c4e..a79865bd 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/imageDataModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/imageDataModel.java
@@ -61,7 +61,7 @@ class imageDataModel
     }
 
     public void mBackgroundThread(){
-        new Thread(){
+        /*new Thread(){
             public void run(){
                 while (true) {
                     try {
@@ -82,7 +82,7 @@ class imageDataModel
                     }
                 }
             }
-        }.start();
+        }.start();*/
     }
 
     private Bitmap getBitmapFromURL(String src) {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/helperManager/helperMethod.java b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/helperMethod.java
index dcb8df43..ecb43313 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/helperManager/helperMethod.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/helperMethod.java
@@ -13,6 +13,7 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -52,9 +53,12 @@ import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 import androidx.core.graphics.ColorUtils;
 
+import com.darkweb.genesissearchengine.appManager.homeManager.geckoManager.geckoSession;
+import com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController;
 import com.darkweb.genesissearchengine.appManager.kotlinHelperLibraries.defaultBrowser;
 import com.darkweb.genesissearchengine.constants.enums;
 import com.darkweb.genesissearchengine.constants.keys;
+import com.darkweb.genesissearchengine.constants.strings;
 import com.example.myapplication.R;
 import org.xmlpull.v1.XmlPullParserException;
 import java.io.ByteArrayInputStream;
@@ -87,7 +91,10 @@ import javax.net.ssl.HttpsURLConnection;
 import static android.content.Context.LAYOUT_INFLATER_SERVICE;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
+import static com.darkweb.genesissearchengine.constants.constants.CONST_LIST_EXTERNAL_SHORTCUT;
+import static com.darkweb.genesissearchengine.constants.constants.CONST_PACKAGE_NAME;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_PLAYSTORE_URL;
+import static com.darkweb.genesissearchengine.constants.keys.M_ACTIVITY_NAVIGATION_BUNDLE_KEY;
 
 public class helperMethod
 {
@@ -172,6 +179,21 @@ public class helperMethod
         context.startActivity(browserIntent);
     }
 
+    public static geckoSession deepCopy(geckoSession object) {
+        try {
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            ObjectOutputStream outputStrm = new ObjectOutputStream(outputStream);
+            outputStrm.writeObject(object);
+            ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
+            ObjectInputStream objInputStream = new ObjectInputStream(inputStream);
+            return (geckoSession)objInputStream.readObject();
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     public static String completeURL(String pURL){
         if(pURL.equals("about:blank")){
             return pURL;
@@ -262,6 +284,36 @@ public class helperMethod
         }
     }
 
+    public static String getDefaultBrowser(AppCompatActivity context){
+        Intent browserIntent = new Intent("android.intent.action.VIEW", Uri.parse("http://"));
+        ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(browserIntent,PackageManager.MATCH_DEFAULT_ONLY);
+        return resolveInfo.activityInfo.packageName;
+    }
+
+    public static void openURLInCustomBrowser(String pData, AppCompatActivity pContext){
+        String mBrowser = helperMethod.getSystemBrowser(pContext);
+        Intent intent = new Intent(Intent.ACTION_VIEW,Uri.parse(pData));
+        intent.setPackage(mBrowser);
+        pContext.startActivity(intent);
+    }
+
+    public static String getSystemBrowser(AppCompatActivity context){
+        PackageManager packageManager = context.getPackageManager();
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse("http://www.google.com"));
+        List<ResolveInfo> list = packageManager.queryIntentActivities(intent, PackageManager.MATCH_ALL);
+        String mBrowser = strings.GENERIC_EMPTY_STR;
+        for (ResolveInfo info : list) {
+            if(!info.activityInfo.packageName.contains(CONST_PACKAGE_NAME)){
+                mBrowser = info.activityInfo.packageName;
+                if(info.activityInfo.packageName.contains("chrome") || info.activityInfo.packageName.contains("google") || info.activityInfo.packageName.contains("firefox")){
+                    return mBrowser;
+                }
+            }
+        }
+        return mBrowser;
+    }
+
     public static void sendIssueEmail(Context context){
         Intent selectorIntent = new Intent(Intent.ACTION_SENDTO);
         selectorIntent.setData(Uri.parse("mailto:"));
@@ -623,6 +675,15 @@ public class helperMethod
         context.startActivity(myIntent);
     }
 
+    public static void openIntent(Intent pIntent,AppCompatActivity pContext, int pType){
+        if(pType == CONST_LIST_EXTERNAL_SHORTCUT){
+            pIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            pIntent.putExtra(M_ACTIVITY_NAVIGATION_BUNDLE_KEY, pType);
+            pContext.startActivity(pIntent);
+            pContext.overridePendingTransition(R.anim.fade_in_lang, R.anim.fade_out_lang);
+        }
+    }
+
     public static void openActivityReverse( Class<?> cls,int type,AppCompatActivity context,boolean animation){
         Intent myIntent = new Intent(context, cls);
         myIntent.putExtra(keys.PROXY_LIST_TYPE, type);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/adManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/adManager.java
deleted file mode 100644
index b3e95997..00000000
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/adManager.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.darkweb.genesissearchengine.pluginManager.adPluginManager;
-
-import android.content.Context;
-import android.os.Handler;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import com.darkweb.genesissearchengine.eventObserver;
-import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
-import com.mopub.common.MoPub;
-import com.mopub.common.SdkConfiguration;
-import com.mopub.common.SdkInitializationListener;
-import com.mopub.mobileads.MoPubErrorCode;
-import com.mopub.mobileads.MoPubView;
-import java.lang.ref.WeakReference;
-import java.util.List;
-import static com.mopub.common.logging.MoPubLog.LogLevel.INFO;
-
-public class adManager
-{
-
-    /*Private Variables */
-
-    private eventObserver.eventListener mEvent;
-    private WeakReference<MoPubView> mBannerAds;
-
-    private int mRequestCount = 0;
-    private boolean mPaidStatus;
-    private boolean bannerAdsLoading = false;
-    private boolean bannerAdsLoaded = false;
-
-    /*Initializations*/
-
-    public adManager(eventObserver.eventListener pEvent, MoPubView pBannerAds, boolean pPaidStatus,Context pContext) {
-        this.mEvent = pEvent;
-        this.mPaidStatus = pPaidStatus;
-        this.mBannerAds = new WeakReference(pBannerAds);
-        initializeBannerAds(pContext);
-    }
-
-    private void initializeBannerAds(Context pContext){
-        if(!mPaidStatus){
-            final SdkConfiguration.Builder configBuilder = new SdkConfiguration.Builder("c122efbe224f46678800d2f73389d258");
-            configBuilder.withLogLevel(INFO);
-            MoPub.initializeSdk(pContext, configBuilder.build(), initSdkListener());
-            admobListeners();
-        }
-    }
-
-    private SdkInitializationListener initSdkListener() {
-        return () -> {
-        };
-    }
-    /*Local Helper Methods*/
-
-    private void loadAds(){
-        if(!mPaidStatus)
-        {
-            if (!bannerAdsLoading)
-            {
-                bannerAdsLoading = true;
-                mBannerAds.get().setAdUnitId("c122efbe224f46678800d2f73389d258");
-                mBannerAds.get().loadAd();
-            }
-        }
-    }
-
-    private boolean isAdvertLoaded(){
-        return bannerAdsLoaded;
-    }
-
-    /*Local Listeners*/
-
-    private void admobListeners(){
-        if(!mPaidStatus){
-            mBannerAds.get().setBannerAdListener(new MoPubView.BannerAdListener() {
-                @Override
-                public void onBannerLoaded(@NonNull MoPubView moPubView) {
-                    bannerAdsLoaded = true;
-                }
-
-                @Override
-                public void onBannerFailed(MoPubView moPubView, MoPubErrorCode moPubErrorCode) {
-
-                    new Handler().postDelayed(() ->
-                    {
-                        if(mRequestCount<10){
-                            mRequestCount+=1;
-                            mBannerAds.get().loadAd();
-                        }
-
-                    }, 30000);
-                }
-
-                @Override
-                public void onBannerClicked(MoPubView moPubView) {
-                    Log.i("asd","asd");
-                }
-
-                @Override
-                public void onBannerExpanded(MoPubView moPubView) {
-                    Log.i("asd","asd");
-                }
-
-                @Override
-                public void onBannerCollapsed(MoPubView moPubView) {
-                    Log.i("asd","asd");
-                }
-            });
-        }
-    }
-
-    /*External Triggers*/
-
-    public Object onTrigger(List<Object> pData, pluginEnums.eAdManager pEventType) {
-        if(pEventType.equals(pluginEnums.eAdManager.M_INITIALIZE_BANNER_ADS))
-        {
-            loadAds();
-        }
-        else if(pEventType.equals(pluginEnums.eAdManager.M_IS_ADVERT_LOADED))
-        {
-            return isAdvertLoaded();
-        }
-        return null;
-    }
-}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/admobManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/admobManager.java
new file mode 100644
index 00000000..5ffa8ad9
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/admobManager.java
@@ -0,0 +1,82 @@
+package com.darkweb.genesissearchengine.pluginManager.adPluginManager;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.darkweb.genesissearchengine.eventObserver;
+import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
+import com.google.android.gms.ads.AdListener;
+import com.google.android.gms.ads.AdRequest;
+import com.google.android.gms.ads.AdView;
+import java.lang.ref.WeakReference;
+import java.util.List;
+
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eAdManagerCallbacks.M_ON_AD_CLICK;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eAdManagerCallbacks.M_ON_AD_LOAD;
+
+public class admobManager extends AdListener {
+
+    /*Private Variables */
+
+    private eventObserver.eventListener mEvent;
+    private WeakReference<AdView> mBannerAds;
+
+    private boolean bannerAdsLoaded = false;
+
+    /*Initializations*/
+
+    public admobManager(eventObserver.eventListener pEvent, AdView pBannerAds, Context pContext) {
+        this.mEvent = pEvent;
+        this.mBannerAds = new WeakReference(pBannerAds);
+        loadAds();
+    }
+
+    /*Local Overrides*/
+
+    @Override
+    public void onAdLoaded() {
+        super.onAdLoaded();
+        bannerAdsLoaded = true;
+        mEvent.invokeObserver(null, M_ON_AD_LOAD);
+    }
+
+    @Override
+    public void onAdClicked(){
+        super.onAdClicked();
+        mEvent.invokeObserver(null, M_ON_AD_CLICK);
+    }
+
+    /*Local Helper Methods*/
+
+    private void loadAds(){
+        AdRequest adRequest = new AdRequest.Builder().build();
+        mBannerAds.get().loadAd(adRequest);
+        mBannerAds.get().setAdListener(this);
+    }
+
+
+    private boolean isAdvertLoaded(){
+        return bannerAdsLoaded;
+    }
+
+    private void onDestroy(){
+        mBannerAds.get().destroy();
+    }
+
+    /*External Triggers*/
+
+    public Object onTrigger(pluginEnums.eAdManager pEventType) {
+        if(pEventType.equals(pluginEnums.eAdManager.M_INITIALIZE_BANNER_ADS))
+        {
+        }
+        else if(pEventType.equals(pluginEnums.eAdManager.M_IS_ADVERT_LOADED))
+        {
+            return isAdvertLoaded();
+        }
+        else if(pEventType.equals(pluginEnums.eAdManager.M_DESTROY))
+        {
+            onDestroy();
+        }
+        return null;
+    }
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/facebookAdsManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/facebookAdsManager.java
new file mode 100644
index 00000000..ed0fc3b4
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/facebookAdsManager.java
@@ -0,0 +1,85 @@
+package com.darkweb.genesissearchengine.pluginManager.adPluginManager;
+
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eAdManagerCallbacks.M_ON_AD_CLICK;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eAdManagerCallbacks.M_ON_AD_LOAD;
+import android.widget.LinearLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import com.darkweb.genesissearchengine.eventObserver;
+import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
+import com.facebook.ads.*;
+import java.lang.ref.WeakReference;
+
+public class facebookAdsManager implements AdListener  {
+
+    /*Private Variables */
+
+    private eventObserver.eventListener mEvent;
+    private WeakReference<LinearLayout> mBannerAds;
+    private AdView adView;
+
+    private boolean bannerAdsLoaded = false;
+
+    /*Initializations*/
+
+    public facebookAdsManager(eventObserver.eventListener pEvent, LinearLayout pBannerAds, AppCompatActivity pContext) {
+        this.mEvent = pEvent;
+        this.mBannerAds = new WeakReference(pBannerAds);
+        loadAds(pContext, pBannerAds);
+    }
+
+    /*Local Overrides*/
+    @Override
+    public void onError(Ad ad, AdError adError) {
+    }
+
+    @Override
+    public void onAdLoaded(Ad ad) {
+        bannerAdsLoaded = true;
+        mEvent.invokeObserver(null, M_ON_AD_LOAD);
+    }
+
+    @Override
+    public void onAdClicked(Ad ad) {
+        mEvent.invokeObserver(null, M_ON_AD_CLICK);
+    }
+
+    @Override
+    public void onLoggingImpression(Ad ad) {
+    }
+
+
+    /*Local Helper Methods*/
+
+    private void loadAds(AppCompatActivity pContext, LinearLayout pLinearLayout){
+        AudienceNetworkAds.initialize(pContext);
+        adView = new AdView(pContext, "856646331639727_856654334972260", AdSize.BANNER_HEIGHT_50);
+        pLinearLayout.addView(adView);
+        adView.loadAd(adView.buildLoadAdConfig().withAdListener(this).build());
+    }
+
+
+    private boolean isAdvertLoaded(){
+        return bannerAdsLoaded;
+    }
+
+    private void onDestroy(){
+        adView.destroy();
+    }
+
+    /*External Triggers*/
+
+    public Object onTrigger(pluginEnums.eAdManager pEventType) {
+        if(pEventType.equals(pluginEnums.eAdManager.M_INITIALIZE_BANNER_ADS))
+        {
+        }
+        else if(pEventType.equals(pluginEnums.eAdManager.M_IS_ADVERT_LOADED))
+        {
+            return isAdvertLoaded();
+        }
+        else if(pEventType.equals(pluginEnums.eAdManager.M_DESTROY))
+        {
+            onDestroy();
+        }
+        return null;
+    }
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/mopubManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/mopubManager.java
new file mode 100644
index 00000000..be12171e
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/mopubManager.java
@@ -0,0 +1,98 @@
+package com.darkweb.genesissearchengine.pluginManager.adPluginManager;
+
+/*
+import android.content.Context;
+import androidx.annotation.NonNull;
+import com.darkweb.genesissearchengine.eventObserver;
+import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
+import com.mopub.common.MoPub;
+import com.mopub.common.SdkConfiguration;
+import com.mopub.common.SdkInitializationListener;
+import com.mopub.mobileads.MoPubErrorCode;
+import com.mopub.mobileads.MoPubView;
+import java.lang.ref.WeakReference;
+import java.util.List;
+import static com.mopub.common.logging.MoPubLog.LogLevel.INFO;
+
+public class mopubManager implements MoPubView.BannerAdListener
+{
+
+    /*Private Variables */
+
+    /*private eventObserver.eventListener mEvent;
+    private WeakReference<MoPubView> mBannerAds;
+
+    private boolean bannerAdsLoaded = false;
+
+    /*Initializations*/
+
+    /*public mopubManager(eventObserver.eventListener pEvent, MoPubView pBannerAds, boolean pPaidStatus, Context pContext) {
+        this.mEvent = pEvent;
+        this.mBannerAds = new WeakReference(pBannerAds);
+        initializeBannerAds(pContext);
+    }
+
+    private void initializeBannerAds(Context pContext){
+        final SdkConfiguration.Builder configBuilder = new SdkConfiguration.Builder("c122efbe224f46678800d2f73389d258");
+        configBuilder.withLogLevel(INFO);
+        MoPub.initializeSdk(pContext, configBuilder.build(), initSdkListener());
+    }
+
+    private SdkInitializationListener initSdkListener() {
+        return () -> {
+        };
+    }
+
+    /* Local Overrides */
+
+    /*@Override
+    public void onBannerLoaded(@NonNull MoPubView moPubView) {
+        bannerAdsLoaded = true;
+    }
+
+    @Override
+    public void onBannerFailed(MoPubView moPubView, MoPubErrorCode moPubErrorCode) {
+
+    }
+
+    @Override
+    public void onBannerClicked(MoPubView moPubView) {
+
+    }
+
+    @Override
+    public void onBannerExpanded(MoPubView moPubView) {
+
+    }
+
+    @Override
+    public void onBannerCollapsed(MoPubView moPubView) {
+
+    }
+
+    /*Local Helper Methods*/
+
+    /*private void loadAds(){
+        mBannerAds.get().setAdUnitId("c122efbe224f46678800d2f73389d258");
+        mBannerAds.get().loadAd();
+    }
+
+    private boolean isAdvertLoaded(){
+        return bannerAdsLoaded;
+    }
+
+   /*External Triggers*/
+
+    /*public Object onTrigger(List<Object> pData, pluginEnums.eAdManager pEventType) {
+        if(pEventType.equals(pluginEnums.eAdManager.M_INITIALIZE_BANNER_ADS))
+        {
+            loadAds();
+        }
+        else if(pEventType.equals(pluginEnums.eAdManager.M_IS_ADVERT_LOADED))
+        {
+            return isAdvertLoaded();
+        }
+        return null;
+    }
+}
+*/
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java
index 3bbf08cb..f4e89974 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java
@@ -9,14 +9,16 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.InsetDrawable;
 import android.net.Uri;
 import android.os.Handler;
+import android.text.Html;
 import android.view.Gravity;
 import android.view.View;
-import android.view.Window;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.RatingBar;
+import android.widget.ScrollView;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
@@ -60,33 +62,28 @@ public class messageManager
     }
 
     private void initializeDialog(int pLayout, int pGravity){
+        mDialog = new Dialog(mContext);
+        mDialog.getWindow().setGravity(pGravity);
+        mDialog.getWindow().getAttributes().windowAnimations = R.style.dialiog_animation;
+
+        Drawable myDrawable;
+        Resources res = mContext.getResources();
         try {
-            if(mDialog !=null && mDialog.isShowing()){
-                mDialog.dismiss();
-            }
+            myDrawable = Drawable.createFromXml(res, res.getXml(R.xml.hox_rounded_corner));
+            mDialog.getWindow().setBackgroundDrawable(myDrawable);
+        } catch (Exception ignored) {
+        }
 
-            mDialog = new Dialog(mContext);
-            mDialog.getWindow().setGravity(pGravity);
-            mDialog.getWindow().getAttributes().windowAnimations = R.style.dialiog_animation;
+        mDialog.setCancelable(true);
+        mDialog.setContentView(pLayout);
 
-            Drawable myDrawable;
-            Resources res = mContext.getResources();
-            try {
-                myDrawable = Drawable.createFromXml(res, res.getXml(R.xml.hox_rounded_corner));
-                mDialog.getWindow().setBackgroundDrawable(myDrawable);
-            } catch (Exception ignored) {
-            }
+        ColorDrawable back = new ColorDrawable(Color.TRANSPARENT);
+        InsetDrawable inset = new InsetDrawable(back, helperMethod.pxFromDp(10),0,helperMethod.pxFromDp(10),0);
+        mDialog.getWindow().setBackgroundDrawable(inset);
+        mDialog.getWindow().setLayout(helperMethod.pxFromDp(350), -1);
+        mDialog.getWindow().setLayout(ConstraintLayout.LayoutParams.MATCH_PARENT, ConstraintLayout.LayoutParams.WRAP_CONTENT);
 
-            mDialog.setCancelable(true);
-            mDialog.setContentView(pLayout);
-
-            ColorDrawable back = new ColorDrawable(Color.TRANSPARENT);
-            InsetDrawable inset = new InsetDrawable(back, helperMethod.pxFromDp(10),0,helperMethod.pxFromDp(10),0);
-            mDialog.getWindow().setBackgroundDrawable(inset);
-            mDialog.getWindow().setLayout(helperMethod.pxFromDp(350), -1);
-            mDialog.getWindow().setLayout(ConstraintLayout.LayoutParams.MATCH_PARENT, ConstraintLayout.LayoutParams.WRAP_CONTENT);
-            mDialog.show();
-        }catch (Exception ignored){}
+        mDialog.show();
     }
 
     public messageManager(eventObserver.eventListener event)
@@ -100,7 +97,7 @@ public class messageManager
     {
         initializeDialog(R.layout.popup_language_support, Gravity.CENTER);
         // ((TextView) mDialog.findViewById(R.id.pLanguage)).setText((mData.get(0).toString()));
-        mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
+        mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
         mDialog.setOnDismissListener(dialog -> onClearReference());
     }
 
@@ -127,10 +124,10 @@ public class messageManager
 
     private void newIdentityCreated()
     {
+        initializeDialog(R.layout.popup_new_circuit, Gravity.BOTTOM);
         final Handler handler = new Handler();
         Runnable runnable = () -> mDialog.dismiss();
 
-        initializeDialog(R.layout.popup_new_circuit, Gravity.BOTTOM);
         mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
 
         mDialog.setOnDismissListener(dialog -> {
@@ -144,17 +141,17 @@ public class messageManager
     private void mDownloadFailure()
     {
         mContext.runOnUiThread(() -> {
+            initializeDialog(R.layout.popup_download_failure, Gravity.BOTTOM);
             final Handler handler = new Handler();
             Runnable runnable = () -> mDialog.dismiss();
 
-            initializeDialog(R.layout.popup_download_failure, Gravity.BOTTOM);
             String mMessage;
             if(mData == null || mData.get(0) == null || (mData.get(0)).equals("0")){
                 mMessage = "\"Unknown\"";
             }else {
                 mMessage = (String) mData.get(0);
             }
-            ((TextView)mDialog.findViewById(R.id.pDescription)).setText(("Request denied Error  " + mMessage));
+            ((TextView)mDialog.findViewById(R.id.pOrbotRowDescription)).setText(("Request denied Error  " + mMessage));
             mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
 
             mDialog.setOnDismissListener(dialog -> {
@@ -169,10 +166,10 @@ public class messageManager
 
     private void popupBlocked()
     {
+        initializeDialog(R.layout.popup_block_popup, Gravity.BOTTOM);
         final Handler handler = new Handler();
         Runnable runnable = () -> mDialog.dismiss();
 
-        initializeDialog(R.layout.popup_block_popup, Gravity.BOTTOM);
         mDialog.findViewById(R.id.pOpenPrivacy).setOnClickListener(v -> {
             mEvent.invokeObserver(null, M_OPEN_PRIVACY);
             mDialog.dismiss();
@@ -189,10 +186,10 @@ public class messageManager
 
     private void popupLoadNewTab()
     {
+        initializeDialog(R.layout.popup_load_new_tab, Gravity.BOTTOM);
         final Handler handler = new Handler();
         Runnable runnable = () -> mDialog.dismiss();
 
-        initializeDialog(R.layout.popup_load_new_tab, Gravity.BOTTOM);
         mDialog.getWindow().setDimAmount(0.3f);
         mDialog.findViewById(R.id.pRestore).setOnClickListener(v -> {
             mEvent.invokeObserver(null, M_UNDO_SESSION);
@@ -210,10 +207,10 @@ public class messageManager
 
     private void popupUndo()
     {
+        initializeDialog(R.layout.popup_undo, Gravity.BOTTOM);
         final Handler handler = new Handler();
         Runnable runnable = () -> mDialog.dismiss();
 
-        initializeDialog(R.layout.popup_undo, Gravity.BOTTOM);
         mDialog.getWindow().setDimAmount(0.3f);
         mDialog.findViewById(R.id.pUndo).setOnClickListener(v -> {
             mEvent.invokeObserver(null, M_UNDO_TAB);
@@ -232,7 +229,37 @@ public class messageManager
     private void onShowToast(int mLayout, int mDelay, String mInfo, String mTriggerText, pluginEnums.eMessageManagerCallbacks pCallback)
     {
         initializeDialog(mLayout, Gravity.BOTTOM);
-        ((TextView)mDialog.findViewById(R.id.pDescription)).setText(mInfo);
+        ((TextView)mDialog.findViewById(R.id.pOrbotRowDescription)).setText(mInfo);
+        ((Button)mDialog.findViewById(R.id.pTrigger)).setText(mTriggerText);
+        mDialog.getWindow().setDimAmount(0.3f);
+
+        final Handler handler = new Handler();
+        Runnable runnable = () -> mDialog.dismiss();
+
+        mDialog.setOnDismissListener(dialog -> {
+            handler.removeCallbacks(runnable);
+            onClearReference();
+        });
+
+        mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> {
+            if(pCallback == null){
+                mEvent.invokeObserver(null, M_UNDO_TAB);
+                mDialog.dismiss();
+                handler.removeCallbacks(runnable);
+            }
+            else {
+                mDialog.dismiss();
+                mEvent.invokeObserver(Collections.singletonList(mContext), pCallback);
+            }
+        });
+
+        handler.postDelayed(runnable, mDelay);
+    }
+
+    private void onShowToastWithCallback(int mLayout, int mDelay, String mInfo, String mTriggerText, pluginEnums.eMessageManagerCallbacks pCallback)
+    {
+        initializeDialog(mLayout, Gravity.BOTTOM);
+        ((TextView)mDialog.findViewById(R.id.pOrbotRowDescription)).setText(mInfo);
         ((Button)mDialog.findViewById(R.id.pTrigger)).setText(mTriggerText);
         mDialog.getWindow().setDimAmount(0.3f);
 
@@ -257,10 +284,10 @@ public class messageManager
 
     private void maxTabReached()
     {
+        initializeDialog(R.layout.popup_max_tab, Gravity.BOTTOM);
         final Handler handler = new Handler();
         Runnable runnable = () -> mDialog.dismiss();
 
-        initializeDialog(R.layout.popup_max_tab, Gravity.BOTTOM);
         mDialog.getWindow().setDimAmount(0);
         mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> {
             mDialog.dismiss();
@@ -304,10 +331,10 @@ public class messageManager
 
     private void orbotLoading()
     {
+        initializeDialog(R.layout.popup_orbot_connecting, Gravity.BOTTOM);
         final Handler handler = new Handler();
         Runnable runnable = () -> mDialog.dismiss();
 
-        initializeDialog(R.layout.popup_orbot_connecting, Gravity.BOTTOM);
         mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             mDialog.dismiss();
             handler.removeCallbacks(runnable);
@@ -323,22 +350,6 @@ public class messageManager
 
     }
 
-    private void dataClearedSuccessfully()
-    {
-        final Handler handler = new Handler();
-        Runnable runnable = () -> mDialog.dismiss();
-
-        initializeDialog(R.layout.popup_data_cleared, Gravity.BOTTOM);
-        mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
-
-        mDialog.setOnDismissListener(dialog -> {
-            handler.removeCallbacks(runnable);
-            onClearReference();
-        });
-
-        handler.postDelayed(runnable, 1500);
-    }
-
     private void applicationCrashed()
     {
         initializeDialog(R.layout.application_crash, Gravity.BOTTOM);
@@ -346,38 +357,97 @@ public class messageManager
         mDialog.setOnDismissListener(dialog -> onClearReference());
     }
 
+    private void openSecurityInfo()
+    {
+        String mInfo = mData.get(0).toString();
+        initializeDialog(R.layout.certificate_info, Gravity.TOP);
+        InsetDrawable inset = new InsetDrawable(new ColorDrawable(Color.TRANSPARENT), 0,0,0,-1);
+        mDialog.getWindow().setBackgroundDrawable(inset);
+        mDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+
+        ((TextView)mDialog.findViewById(R.id.pCertificateDesciption)).setText(Html.fromHtml((String)mData.get(0)));
+        mDialog.findViewById(R.id.pCertificateRootBackground).animate().setStartDelay(100).setDuration(400).alpha(1);
+
+        if(mInfo.equals("Onion Secured Connection")){
+            ScrollView mCertificateScrollView = mDialog.findViewById(R.id.pCertificateScrollView);
+
+            ViewGroup.LayoutParams params = mCertificateScrollView.getLayoutParams();
+            params.height = helperMethod.pxFromDp(60);
+            mCertificateScrollView.requestLayout();
+            mCertificateScrollView.requestDisallowInterceptTouchEvent(false);
+        }else {
+            mDialog.findViewById(R.id.pCertificateRootBlocker).setVisibility(View.GONE);
+        }
+
+
+        mDialog.findViewById(R.id.pCertificateDesciption).setOnClickListener(v -> {
+            mDialog.findViewById(R.id.pCertificateRootBackground).animate().setDuration(150).alpha(0);
+            mDialog.dismiss();
+        });
+
+        mDialog.findViewById(R.id.pCertificateRootBackground).setOnClickListener(v -> {
+            mDialog.dismiss();
+        });
+
+        mDialog.setOnDismissListener(dialogInterface -> {
+            mDialog.findViewById(R.id.pCertificateRootBlocker).animate().setDuration(200).alpha(0);
+        });
+    }
+
     private void openSecureConnectionPopup()
     {
         initializeDialog(R.layout.secure_connection_popup, Gravity.TOP);
-        Window window = mDialog.getWindow();
-        window.setLayout(ConstraintLayout.LayoutParams.MATCH_PARENT, ConstraintLayout.LayoutParams.WRAP_CONTENT);
-
-        ColorDrawable back = new ColorDrawable(Color.TRANSPARENT);
-        InsetDrawable inset = new InsetDrawable(back, 0,0,0,0);
+        InsetDrawable inset = new InsetDrawable(new ColorDrawable(Color.TRANSPARENT), 0,0,0,-1);
         mDialog.getWindow().setBackgroundDrawable(inset);
-        mDialog.setCancelable(true);
-        mDialog.setCanceledOnTouchOutside(true);
-        mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
-        mDialog.findViewById(R.id.pNext).setOnClickListener(v -> mEvent.invokeObserver(null, M_SECURE_CONNECTION));
+        mDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+
+
+        mDialog.findViewById(R.id.pSecureRootBlocker).animate().setStartDelay(100).setDuration(400).alpha(1);
+        ((TextView) mDialog.findViewById(R.id.pSecureSubHeader)).setText(helperMethod.getDomainName(mData.get(0).toString().replace("genesishiddentechnologies.com", "genesis.onion")));
+        mDialog.setOnDismissListener(dialog -> onClearReference());
 
         if((boolean) mData.get(1)){
-            ((SwitchMaterial) mDialog.findViewById(R.id.pJSStatus)).setChecked(true);
+            ((SwitchMaterial) mDialog.findViewById(R.id.pSecureJavascriptStatus)).setChecked(true);
         }else {
-            ((SwitchMaterial) mDialog.findViewById(R.id.pJSStatus)).setChecked(false);
+            ((SwitchMaterial) mDialog.findViewById(R.id.pSecureJavascriptStatus)).setChecked(false);
         }
         if((boolean) mData.get(2)){
-            ((SwitchMaterial) mDialog.findViewById(R.id.pDTStatus)).setChecked(true);
+            ((SwitchMaterial) mDialog.findViewById(R.id.pSecureTrackingStatus)).setChecked(true);
         }else {
-            ((SwitchMaterial) mDialog.findViewById(R.id.pDTStatus)).setChecked(false);
+            ((SwitchMaterial) mDialog.findViewById(R.id.pSecureTrackingStatus)).setChecked(false);
         }
         if((int) mData.get(3) != ContentBlocking.AntiTracking.NONE){
-            ((SwitchMaterial) mDialog.findViewById(R.id.pTPStatus)).setChecked(true);
+            ((SwitchMaterial) mDialog.findViewById(R.id.pSecureTrackingProtectionStatus)).setChecked(true);
         }else {
-            ((SwitchMaterial) mDialog.findViewById(R.id.pTPStatus)).setChecked(false);
+            ((SwitchMaterial) mDialog.findViewById(R.id.pSecureTrackingProtectionStatus)).setChecked(false);
         }
 
-        ((TextView) mDialog.findViewById(R.id.pHeaderSubpart)).setText(helperMethod.getDomainName(mData.get(0).toString().replace("genesishiddentechnologies.com", "genesis.onion")));
-        mDialog.setOnDismissListener(dialog -> onClearReference());
+        mDialog.findViewById(R.id.pSecureRootBlocker).setOnClickListener(v -> {
+            mDialog.findViewById(R.id.pSecureRootBlocker).animate().setDuration(150).alpha(0);
+            mDialog.dismiss();
+        });
+
+        mDialog.findViewById(R.id.pSecureCertificate).setOnClickListener(v -> {
+            mDialog.findViewById(R.id.pSecureRootBlocker).animate().setDuration(150).alpha(0);
+            mDialog.dismiss();
+            new Handler().postDelayed(() ->
+            {
+                mEvent.invokeObserver(null, M_SECURITY_INFO);
+            }, 500);
+        });
+
+        mDialog.findViewById(R.id.pSecurePrivacy).setOnClickListener(v -> {
+            mDialog.findViewById(R.id.pSecureRootBlocker).animate().setDuration(150).alpha(0);
+            helperMethod.onDelayHandler(mContext, 250, () -> {
+                mEvent.invokeObserver(null, M_SECURE_CONNECTION);
+                mDialog.dismiss();
+                return null;
+            });
+        });
+
+        mDialog.setOnDismissListener(dialogInterface -> {
+            mDialog.findViewById(R.id.pSecureRootBlocker).animate().setDuration(200).alpha(0);
+        });
     }
 
     private void bookmark()
@@ -517,7 +587,7 @@ public class messageManager
                 murl = "https://" + murl;
             }
 
-            ((TextView) mDialog.findViewById(R.id.pDescription)).setText(mData.get(0).toString());
+            ((TextView) mDialog.findViewById(R.id.pOrbotRowDescription)).setText(mData.get(0).toString());
             ((TextView) mDialog.findViewById(R.id.pDescriptionLong)).setText(murl);
             mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
             mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
@@ -536,6 +606,7 @@ public class messageManager
     private void rateApp()
     {
         initializeDialog(R.layout.popup_rate_us, Gravity.CENTER);
+        mDialog.setCancelable(false);
         mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
         mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             RatingBar mRatingBar = mDialog.findViewById(R.id.pRating);
@@ -572,7 +643,7 @@ public class messageManager
         }
 
         initializeDialog(R.layout.popup_file_longpress, Gravity.CENTER);
-        ((TextView) mDialog.findViewById(R.id.pDescription)).setText((title + mData.get(0).toString()));
+        ((TextView) mDialog.findViewById(R.id.pOrbotRowDescription)).setText((title + mData.get(0).toString()));
         mEvent.invokeObserver(Arrays.asList(((ImageView) mDialog.findViewById(R.id.pFaviconLogo)), helperMethod.getDomainName(mData.get(0).toString())), enums.etype.fetch_favicon);
         mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
         mDialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
@@ -607,7 +678,7 @@ public class messageManager
         String title = mData.get(2).toString();
 
         initializeDialog(R.layout.popup_url_longpress, Gravity.CENTER);
-        ((TextView) mDialog.findViewById(R.id.pDescription)).setText((title + mData.get(0)));
+        ((TextView) mDialog.findViewById(R.id.pOrbotRowDescription)).setText((title + mData.get(0)));
         mEvent.invokeObserver(Arrays.asList(((ImageView) mDialog.findViewById(R.id.pFaviconLogo)), helperMethod.getDomainName(mData.get(0).toString())), enums.etype.fetch_favicon);
         mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
         mDialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
@@ -662,7 +733,7 @@ public class messageManager
         initializeDialog(R.layout.popup_download_full, Gravity.CENTER);
         mEvent.invokeObserver(Arrays.asList(((ImageView) mDialog.findViewById(R.id.pFaviconLogo)), helperMethod.getDomainName(data_local)), enums.etype.fetch_favicon);
 
-        ((TextView) mDialog.findViewById(R.id.pDescription)).setText((mDescription));
+        ((TextView) mDialog.findViewById(R.id.pOrbotRowDescription)).setText((mDescription));
         ((TextView) mDialog.findViewById(R.id.pDescriptionShort)).setText((mDescriptionShort));
         mDialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
             if(mData!=null){
@@ -811,11 +882,6 @@ public class messageManager
                     onPanic();
                     break;
 
-                case M_DATA_CLEARED:
-                    /*VERIFIED*/
-                    dataClearedSuccessfully();
-                    break;
-
                 case M_APPLICATION_CRASH:
                     /*VERIFIED*/
                     applicationCrashed();
@@ -826,6 +892,11 @@ public class messageManager
                     openSecureConnectionPopup();
                     break;
 
+                case M_SECURITY_INFO:
+                    /*VERIFIED*/
+                    openSecurityInfo();
+                    break;
+
                 case M_DOWNLOAD_SINGLE:
                     /*VERIFIED*/
                     downloadSingle();
@@ -871,6 +942,11 @@ public class messageManager
                     popupUndo();
                     break;
 
+                case M_DATA_CLEARED:
+                    /*VERIFIED*/
+                    onShowToast(R.layout.popup_data_cleared, 2500, mContext.getString(R.string.ALERT_DISMISS), mContext.getString(R.string.ALERT_DISMISS), null);
+                    break;
+
                 case M_DELETE_BOOKMARK:
                     /*VERIFIED*/
                     onShowToast(R.layout.popup_toast_generic, 2000, mContext.getString(R.string.HOME_MENU__BOOKMARK_REMOVED), mContext.getString(R.string.ALERT_DISMISS), null);
@@ -880,6 +956,11 @@ public class messageManager
                     /*VERIFIED*/
                     onShowToast(R.layout.popup_toast_generic, 2000, mContext.getString(R.string.HOME_MENU__BOOKMARK_UPDATE), mContext.getString(R.string.ALERT_DISMISS), null);
                     break;
+
+                case M_IMAGE_UPDATE:
+                    /*VERIFIED*/
+                    onShowToast(R.layout.popup_toast_generic, 4000, mContext.getString(R.string.ALERT_IMAGE_STATUS), mContext.getString(R.string.ALERT_RESTART), M_IMAGE_UPDATE_RESTART);
+                    break;
             }
         }
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/orbotPluginManager/orbotLogManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/orbotPluginManager/orbotLogManager.java
new file mode 100644
index 00000000..d2730d81
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/orbotPluginManager/orbotLogManager.java
@@ -0,0 +1,49 @@
+package com.darkweb.genesissearchengine.pluginManager.orbotPluginManager;
+
+import com.darkweb.genesissearchengine.constants.strings;
+import java.util.List;
+import static com.darkweb.genesissearchengine.pluginManager.orbotPluginManager.orbotPluginEnums.eLogManager.M_GET_CLEANED_LOGS;
+
+public class orbotLogManager
+{
+
+    private String onGetCleanedLogs(String pLogs)
+    {
+        String logs = pLogs;
+
+        if(logs.equals("Starting Genesis | Please Wait ...")){
+            return logs;
+        }
+
+        if(pLogs.equals("No internet connection")){
+            return "Warning | " + pLogs;
+        }
+
+        else if(pLogs.startsWith("Invalid Configuration")){
+            return pLogs;
+        }
+
+        if(!logs.contains("Bootstrapped")){
+            logs = "Initializing Bootstrap";
+        }
+
+        if(!logs.equals(strings.GENERIC_EMPTY_STR))
+        {
+            String Logs = logs;
+            Logs="Installing | " + Logs.replace("FAILED","Securing");
+            return Logs;
+        }
+        return "Loading Please Wait...";
+    }
+
+    /*External Triggers*/
+
+    public Object onTrigger(List<Object> pData, orbotPluginEnums.eLogManager pEventType) {
+        if(pEventType.equals(M_GET_CLEANED_LOGS))
+        {
+            return onGetCleanedLogs((String) pData.get(0));
+        }
+        return null;
+    }
+
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/orbotPluginManager/orbotManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/orbotPluginManager/orbotManager.java
index 1bfaec8b..f25e6d90 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/orbotPluginManager/orbotManager.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/orbotPluginManager/orbotManager.java
@@ -1,48 +1,33 @@
 package com.darkweb.genesissearchengine.pluginManager.orbotPluginManager;
 
-import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.os.Build;
-import android.os.Handler;
-import android.os.IBinder;
-import android.view.View;
-
 import androidx.appcompat.app.AppCompatActivity;
-import org.mozilla.gecko.PrefsHelper;
 import org.torproject.android.service.OrbotService;
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.wrapper.orbotLocalConstants;
-
 import java.lang.ref.WeakReference;
 import java.util.Collections;
 import java.util.List;
-
-import com.darkweb.genesissearchengine.appManager.activityContextManager;
-import com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController;
 import com.darkweb.genesissearchengine.constants.constants;
-import com.darkweb.genesissearchengine.constants.enums;
 import com.darkweb.genesissearchengine.constants.keys;
-import com.darkweb.genesissearchengine.constants.status;
-import com.darkweb.genesissearchengine.constants.strings;
 import com.darkweb.genesissearchengine.eventObserver;
-import com.darkweb.genesissearchengine.helperManager.helperMethod;
-import com.darkweb.genesissearchengine.pluginManager.pluginController;
 import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
-
-import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_APPLICATION_CRASH;
+import static android.content.Context.MODE_PRIVATE;
+import static com.darkweb.genesissearchengine.pluginManager.orbotPluginManager.orbotPluginEnums.eLogManager.M_GET_CLEANED_LOGS;
 import static org.torproject.android.service.TorServiceConstants.ACTION_START;
-
+import static org.torproject.android.service.TorServiceConstants.ACTION_STOP;
 
 // https://github.com/guardianproject/orbot/blob/8fca5f8ecddb4da9565ac3fd8936e4f28acdd352/BUILD.md
+
 public class orbotManager
 {
 
     /*Private Variables*/
 
     private WeakReference<AppCompatActivity> mAppContext;
-    private boolean mLogsStarted = false;
+    private orbotLogManager mLogManger;
 
     /*Initialization*/
 
@@ -54,237 +39,103 @@ public class orbotManager
 
     public void initialize(AppCompatActivity pAppContext, eventObserver.eventListener pEvent, int pNotificationStatus){
         this.mAppContext = new WeakReference(pAppContext);
+        this.mLogManger = new orbotLogManager();
 
         onInitNotificationStatus(pNotificationStatus);
     }
 
-    public void onRemoveInstances(){
-        this.mAppContext = null;
-    }
-
-    private void onStartOrbot(String pBridgeCustomBridge, boolean pBridgeGatewayManual, String pBridgeCustomType, boolean pBridgeStatus, int pShowImages, boolean mClearOnExit, String pBridgesDefault){
+    private void onInitlizeOrbot(String pBridgeCustomBridge, boolean pBridgeGatewayManual, String pBridgeCustomType, boolean pBridgeStatus, String pBridgesDefault){
         orbotLocalConstants.mBridges = pBridgeCustomBridge;
         orbotLocalConstants.mIsManualBridge = pBridgeGatewayManual;
         orbotLocalConstants.mManualBridgeType = pBridgeCustomType;
         orbotLocalConstants.mBridgesDefault = pBridgesDefault;
         Prefs.putBridgesEnabled(pBridgeStatus);
 
-        bindService();
-        initializeProxy(pShowImages, mClearOnExit);
+        onInitailizeService();
     }
 
-    private void bindService(){
-        ServiceConnection mServerConn = new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName name, IBinder binder) {
-            }
-
-            @Override
-            public void onServiceDisconnected(ComponentName name) {
-            }
-        };
-
-        Intent mServiceIntent = new Intent(mAppContext.get().getApplicationContext(), OrbotService.class);
+    private void onInitailizeService(){
+        Intent mServiceIntent = new Intent(mAppContext.get(), OrbotService.class);
         mServiceIntent.setAction(ACTION_START);
 
-        helperMethod.onDelayHandler(activityContextManager.getInstance().getHomeController(), 3000, () -> {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                mAppContext.get().stopService(mServiceIntent);
-                mAppContext.get().startForegroundService(mServiceIntent);
-            }
-            else
-            {
-                mAppContext.get().stopService(mServiceIntent);
-                mAppContext.get().startService(mServiceIntent);
-            }
-            mAppContext.get().bindService(mServiceIntent, mServerConn, Context.BIND_AUTO_CREATE);
-            return null;
-        });
 
+        Intent startTorIntent = new Intent(mAppContext.get(), OrbotService.class);
+        startTorIntent.setAction(ACTION_START);
+        if (mAppContext.get().getPackageName() != null) {
+            startTorIntent.putExtra(OrbotService.EXTRA_PACKAGE_NAME, mAppContext.get().getPackageName());
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && Prefs.persistNotifications()) {
+            mAppContext.get().startForegroundService(startTorIntent);
+        } else {
+            mAppContext.get().startService(startTorIntent);
+        }
+
+        SharedPreferences settings = mAppContext.get().getSharedPreferences("se", MODE_PRIVATE);
+        SharedPreferences.Editor editor = settings.edit();
+        editor.putInt(keys.PROXY_TYPE, 1);
+        editor.putString(keys.PROXY_SOCKS, constants.CONST_PROXY_SOCKS);
+        editor.putInt(keys.PROXY_SOCKS_PORT, orbotLocalConstants.mSOCKSPort);
+        editor.putInt(keys.PROXY_SOCKS_VERSION,constants.CONST_PROXY_SOCKS_VERSION);
+        editor.putBoolean(keys.PROXY_SOCKS_REMOTE_DNS,constants.CONST_PROXY_SOCKS_REMOTE_DNS);
+        editor.apply();
+
+    }
+
+    private void onInitNotificationStatus(int status){
+        orbotLocalConstants.mNotificationStatus = status;
     }
 
     /*Helper Methods*/
 
-    private int onGetNotificationStatus(){
-        return orbotLocalConstants.mNotificationStatus;
+    public Object onTriggerCommands(List<Object> pData, pluginEnums.eOrbotManager pCommands){
+        if(pCommands.equals(pluginEnums.eOrbotManager.M_GET_NOTIFICATION_STATUS)){
+            return orbotLocalConstants.mNotificationStatus;
+        }
+        else if(pCommands.equals(pluginEnums.eOrbotManager.M_ENABLE_NOTIFICATION)){
+            OrbotService.getServiceObject().enableNotification();
+        }
+        else if(pCommands.equals(pluginEnums.eOrbotManager.M_DISABLE_NOTIFICATION)){
+            OrbotService.getServiceObject().disableNotification();
+        }
+        else if(pCommands.equals(pluginEnums.eOrbotManager.M_UPDATE_BRIDGES)){
+            Prefs.putBridgesEnabled((boolean)pData.get(0));
+        }
+        else if(pCommands.equals(pluginEnums.eOrbotManager.M_UPDATE_VPN)){
+            Prefs.putUseVpn((boolean)pData.get(0));
+        }
+        else if(pCommands.equals(pluginEnums.eOrbotManager.M_NEW_CIRCUIT)){
+            if(OrbotService.getServiceObject()!=null){
+                OrbotService.getServiceObject().newIdentity();
+            }
+        }
+        else if(pCommands.equals(pluginEnums.eOrbotManager.M_GET_ORBOT_STATUS)){
+            return OrbotService.getServiceObject().getProxyStatus();
+        }
+
+        return null;
     }
-    private void onInitNotificationStatus(int status){
-        orbotLocalConstants.mNotificationStatus = status;
-    }
-    private void onEnableTorNotification(){
-        OrbotService.getServiceObject().enableNotification();
-    }
-    private void onDisableTorNotification(){
-        OrbotService.getServiceObject().disableNotification();
-    }
-    private void onEnableTorNotificationNoBandwidth(){
-        OrbotService service = OrbotService.getServiceObject();
-        if(service!=null){
-            OrbotService.getServiceObject().enableTorNotificationNoBandwidth();
+
+
+    private void onDestroy(boolean pThemeApplying){
+        if(!pThemeApplying) {
+            Intent mServiceIntent = new Intent(mAppContext.get(), OrbotService.class);
+            mServiceIntent.setAction(ACTION_STOP);
+            mAppContext.get().startService(mServiceIntent);
+            mAppContext.get().stopService(mServiceIntent);
         }
     }
 
-    private  void onUpdateBridges(boolean p_status){
-        Prefs.putBridgesEnabled(p_status);
-    }
-    private  void onUpdateVPN(boolean p_status){
-        Prefs.putUseVpn(p_status);
-    }
-
-    /*Proxy Manager*/
-
-    private void onSetProxy(){
-        PrefsHelper.setPref(keys.PROXY_TYPE, 1);
-        PrefsHelper.setPref(keys.PROXY_SOCKS,constants.CONST_PROXY_SOCKS);
-        PrefsHelper.setPref(keys.PROXY_SOCKS_PORT, orbotLocalConstants.mSOCKSPort);
-        PrefsHelper.setPref(keys.PROXY_SOCKS_VERSION,constants.CONST_PROXY_SOCKS_VERSION);
-        PrefsHelper.setPref(keys.PROXY_SOCKS_REMOTE_DNS,constants.CONST_PROXY_SOCKS_REMOTE_DNS);
-    }
-
-    private void onRestartProxy(){
-        bindService();
-    }
-
-    private void initializeProxy(int pShowImages, boolean mClearOnExit)
-    {
-        PrefsHelper.setPref(keys.PROXY_CACHE,constants.CONST_PROXY_CACHE);
-        PrefsHelper.setPref(keys.PROXY_MEMORY,constants.CONST_PROXY_MEMORY);
-        PrefsHelper.setPref(keys.PROXY_DO_NOT_TRACK_HEADER_ENABLED,constants.CONST_PROXY_DO_NOT_TRACK_HEADER_ENABLED);
-        PrefsHelper.setPref(keys.PROXY_DO_NOT_TRACK_HEADER_VALUE,constants.CONST_PROXY_DO_NOT_TRACK_HEADER_VALUE);
-
-        PrefsHelper.setPref("browser.cache.disk.enable",true);
-        PrefsHelper.setPref("browser.cache.memory.enable",true);
-        PrefsHelper.setPref("browser.cache.disk.capacity",1000);
-        PrefsHelper.setPref("Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0","en-us,en;q=0.5");
-
-        PrefsHelper.setPref("browser.display.show_image_placeholders",true);
-        PrefsHelper.setPref("browser.cache.disk.enable",false);
-        PrefsHelper.setPref("browser.cache.memory.enable",true);
-        PrefsHelper.setPref("browser.cache.disk.capacity",0);
-        PrefsHelper.setPref("privacy.resistFingerprinting",true);
-        PrefsHelper.setPref("privacy.donottrackheader.enabled",false);
-        PrefsHelper.setPref("privacy.donottrackheader.value",1);
-        PrefsHelper.setPref("network.http.sendRefererHeader", 0);
-        PrefsHelper.setPref("security.OCSP.require", false);
-        PrefsHelper.setPref("security.checkloaduri",false);
-        PrefsHelper.setPref("security.mixed_content.block_active_content",false);
-        PrefsHelper.setPref("security.mixed_content.block_display_content", false);
-        PrefsHelper.setPref("media.peerconnection.enabled",false); //webrtc disabled
-        PrefsHelper.setPref("Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0","en-us,en;q=0.5");
-
-        PrefsHelper.setPref("browser.cache.disk_cache_ssl",true);
-        PrefsHelper.setPref("signon.formlessCapture.enabled",true);
-        PrefsHelper.setPref("signon.storeWhenAutocompleteOff",true);
-        PrefsHelper.setPref("signon.storeWhenAutocompleteOff",true);
-        PrefsHelper.setPref("dom.event.contextmenu.enabled",true);
-        PrefsHelper.setPref("layout.css.visited_links_enabled",true);
-        PrefsHelper.setPref("security.ssl3.ecdhe_rsa_aes_128_sha",true);
-        PrefsHelper.setPref("security.ssl3.ecdhe_ecdsa_aes_128_sha",true);
-        PrefsHelper.setPref("security.ssl3.dhe_rsa_aes_128_sha",true);
-        PrefsHelper.setPref("security.ssl3.rsa_des_ede3_sha",true);
-        PrefsHelper.setPref("security.ssl3.dhe_rsa_aes_256_sha",true);
-
-        PrefsHelper.setPref("browser.send_pings.require_same_host",false);
-        PrefsHelper.setPref("webgl.disabled",false);
-        PrefsHelper.setPref("browser.safebrowsing.blockedURIs.enabled",false);
-        PrefsHelper.setPref("media.gmp-provider.enabled",false);
-        PrefsHelper.setPref("browser.send_pings.require_same_host",false);
-        PrefsHelper.setPref("webgl.disabled",false);
-        PrefsHelper.setPref("pdfjs.enableWebGL",false);
-        PrefsHelper.setPref("browser.safebrowsing.malware.enabled",false);
-        PrefsHelper.setPref("security.csp.experimentalEnabled",false);
-        PrefsHelper.setPref("network.http.referer.spoofSource",false);
-        PrefsHelper.setPref("security.OCSP.require",false);
-        PrefsHelper.setPref("security.ssl.treat_unsafe_negotiation_as_broken",	false);
-        PrefsHelper.setPref("security.ssl.require_safe_negotiation",false);
-
-        onUpdatePrivacyPreferences(pShowImages, mClearOnExit);
-    }
-
-    private void onUpdatePrivacyPreferences(int pShowImages, boolean mClearOnExit)
-    {
-        PrefsHelper.setPref(keys.PROXY_IMAGE, pShowImages);
-        PrefsHelper.setPref("privacy.clearOnShutdown.cache",mClearOnExit);
-        PrefsHelper.setPref("privacy.clearOnShutdown.downloads",mClearOnExit);
-        PrefsHelper.setPref("privacy.clearOnShutdown.formdata",mClearOnExit);
-        PrefsHelper.setPref("privacy.clearOnShutdown.history",mClearOnExit);
-        PrefsHelper.setPref("privacy.clearOnShutdown.offlineApps",mClearOnExit);
-        PrefsHelper.setPref("privacy.clearOnShutdown.passwords",mClearOnExit);
-        PrefsHelper.setPref("privacy.clearOnShutdown.sessions",mClearOnExit);
-        PrefsHelper.setPref("privacy.clearOnShutdown.siteSettings",mClearOnExit);
-
-    }
-
-    /*Log Manager*/
-
     private String getLogs()
     {
-        String logs = orbotLocalConstants.mTorLogsStatus;
-
-        if(logs.equals("Starting Genesis | Please Wait ...")){
-            return logs;
-        }
-
-        if(orbotLocalConstants.mTorLogsStatus.equals("No internet connection")){
-            return "Warning | " + orbotLocalConstants.mTorLogsStatus;
-        }
-
-        else if(orbotLocalConstants.mTorLogsStatus.startsWith("Invalid Configuration")){
-            return orbotLocalConstants.mTorLogsStatus;
-        }
-
-        if(!logs.contains("Bootstrapped") && !mLogsStarted){
-            logs = "Initializing Bootstrap";
-            mLogsStarted = true;
-        }
-
-        if(!logs.equals(strings.GENERIC_EMPTY_STR))
-        {
-            String Logs = logs;
-            Logs="Installing | " + Logs.replace("FAILED","Securing");
-            return Logs;
-        }
-        return "Loading Please Wait";
-    }
-
-    private boolean isOrbotRunning(){
-        return orbotLocalConstants.mIsTorInitialized;
-    }
-
-    private void newCircuit(){
-        if(OrbotService.getServiceObject()!=null){
-            OrbotService.getServiceObject().newIdentity();
-        }
-    }
-
-    private String getOrbotStatus(){
-        return OrbotService.getServiceObject().getProxyStatus();
-    }
-
-    private void onDestroy(boolean pThemeApplying){
-        if(pThemeApplying) {
-            OrbotService.getServiceObject().onDestroy();
-        }
+        return (String) mLogManger.onTrigger(Collections.singletonList(orbotLocalConstants.mTorLogsStatus), M_GET_CLEANED_LOGS);
     }
 
     /*External Triggers*/
 
     public Object onTrigger(List<Object> pData, pluginEnums.eOrbotManager pEventType) {
-        if(pEventType.equals(pluginEnums.eOrbotManager.M_GET_NOTIFICATION_STATUS))
+        if(pEventType.equals(pluginEnums.eOrbotManager.M_GET_NOTIFICATION_STATUS) || pEventType.equals(pluginEnums.eOrbotManager.M_ENABLE_NOTIFICATION) || pEventType.equals(pluginEnums.eOrbotManager.M_DISABLE_NOTIFICATION) || pEventType.equals(pluginEnums.eOrbotManager.M_DISABLE_NOTIFICATION_NO_BANDWIDTH) || pEventType.equals(pluginEnums.eOrbotManager.M_IS_ORBOT_RUNNING) || pEventType.equals(pluginEnums.eOrbotManager.M_GET_ORBOT_STATUS) || pEventType.equals(pluginEnums.eOrbotManager.M_UPDATE_VPN) || pEventType.equals(pluginEnums.eOrbotManager.M_UPDATE_BRIDGES) || pEventType.equals(pluginEnums.eOrbotManager.M_SHOW_NOTIFICATION_STATUS) || pEventType.equals(pluginEnums.eOrbotManager.M_ORBOT_RUNNING) || pEventType.equals(pluginEnums.eOrbotManager.M_NEW_CIRCUIT))
         {
-            return onGetNotificationStatus();
-        }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_ENABLE_NOTIFICATION))
-        {
-            onEnableTorNotification();
-        }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_DISABLE_NOTIFICATION))
-        {
-            onDisableTorNotification();
-        }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_DISABLE_NOTIFICATION_NO_BANDWIDTH))
-        {
-            onEnableTorNotificationNoBandwidth();
+            return onTriggerCommands(pData, pEventType);
         }
         else if(pEventType.equals(pluginEnums.eOrbotManager.M_GET_LOGS))
         {
@@ -292,52 +143,15 @@ public class orbotManager
         }
         else if(pEventType.equals(pluginEnums.eOrbotManager.M_UPDATE_PRIVACY))
         {
-            onUpdatePrivacyPreferences((int) pData.get(0),(boolean) pData.get(1));
         }
         else if(pEventType.equals(pluginEnums.eOrbotManager.M_START_ORBOT))
         {
-            onStartOrbot((String) pData.get(0),(boolean) pData.get(1),(String) pData.get(2),(boolean) pData.get(3),(int) pData.get(4),(boolean) pData.get(5),(String) pData.get(6));
-        }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_IS_ORBOT_RUNNING))
-        {
-            isOrbotRunning();
-        }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_GET_ORBOT_STATUS))
-        {
-            return getOrbotStatus();
-        }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_UPDATE_VPN))
-        {
-            onUpdateVPN((boolean)pData.get(0));
-        }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_UPDATE_BRIDGES))
-        {
-            onUpdateBridges((boolean)pData.get(0));
-        }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_SET_PROXY))
-        {
-            onSetProxy();
-        }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_SHOW_NOTIFICATION_STATUS))
-        {
-            onInitNotificationStatus((int)pData.get(0));
-        }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_ORBOT_RUNNING))
-        {
-            return isOrbotRunning();
-        }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_NEW_CIRCUIT))
-        {
-            newCircuit();
+            onInitlizeOrbot((String) pData.get(0),(boolean) pData.get(1),(String) pData.get(2),(boolean) pData.get(3), (String) pData.get(6));
         }
         else if(pEventType.equals(pluginEnums.eOrbotManager.M_DESTROY))
         {
             onDestroy((boolean) pData.get(0));
         }
-        else if(pEventType.equals(pluginEnums.eOrbotManager.M_RESTART_PROXY))
-        {
-            onRestartProxy();
-        }
         return null;
     }
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/orbotPluginManager/orbotPluginEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/orbotPluginManager/orbotPluginEnums.java
new file mode 100644
index 00000000..2365d253
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/orbotPluginManager/orbotPluginEnums.java
@@ -0,0 +1,13 @@
+package com.darkweb.genesissearchengine.pluginManager.orbotPluginManager;
+
+public class orbotPluginEnums
+{
+    /*Orbot Log Manager*/
+    public enum eLogManager {
+        M_GET_CLEANED_LOGS
+    }
+
+    public enum eProxyManager {
+        M_INIT_PROXY, M_INIT_PRIVACY
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
index b38b4804..47f952db 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
@@ -1,8 +1,8 @@
 package com.darkweb.genesissearchengine.pluginManager;
 
+import android.content.Intent;
 import android.os.Handler;
 import android.widget.ImageView;
-
 import androidx.appcompat.app.AppCompatActivity;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
 import com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController;
@@ -16,32 +16,35 @@ import com.darkweb.genesissearchengine.dataManager.dataController;
 import com.darkweb.genesissearchengine.dataManager.dataEnums;
 import com.darkweb.genesissearchengine.eventObserver;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
-import com.darkweb.genesissearchengine.pluginManager.adPluginManager.adManager;
+import com.darkweb.genesissearchengine.pluginManager.adPluginManager.admobManager;
+import com.darkweb.genesissearchengine.pluginManager.adPluginManager.facebookAdsManager;
 import com.darkweb.genesissearchengine.pluginManager.analyticPluginManager.analyticManager;
 import com.darkweb.genesissearchengine.pluginManager.downloadPluginManager.downloadManager;
 import com.darkweb.genesissearchengine.pluginManager.langPluginManager.langManager;
 import com.darkweb.genesissearchengine.pluginManager.messagePluginManager.messageManager;
 import com.darkweb.genesissearchengine.pluginManager.notificationPluginManager.notifictionManager;
 import com.darkweb.genesissearchengine.pluginManager.orbotPluginManager.orbotManager;
+import com.example.myapplication.R;
 
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
-
 import static com.darkweb.genesissearchengine.constants.enums.etype.fetch_favicon;
-import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eAdManagerCallbacks.M_SHOW_LOADED_ADS;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eAdManagerCallbacks.M_ON_AD_CLICK;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eAdManagerCallbacks.M_ON_AD_LOAD;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eLangManager.M_ACTIVITY_CREATED;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eLangManager.M_RESUME;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.*;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.*;
+import static org.webrtc.ContextUtils.getApplicationContext;
 
 public class pluginController
 {
     /*Plugin Instance*/
 
-    private adManager mAdManager;
+    private facebookAdsManager mAdManager;
     private com.darkweb.genesissearchengine.pluginManager.analyticPluginManager.analyticManager mAnalyticsManager;
     private messageManager mMessageManager;
     private notifictionManager mNotificationManager;
@@ -74,7 +77,6 @@ public class pluginController
 
     public void onRemoveInstances(){
         mHomeController = null;
-        mOrbotManager.onRemoveInstances();
     }
 
     private void instanceObjectInitialization()
@@ -83,7 +85,7 @@ public class pluginController
         mContextManager = activityContextManager.getInstance();
 
         mNotificationManager = new notifictionManager(mHomeController,new notificationCallback());
-        mAdManager = new adManager(new admobCallback(), ((homeController)mHomeController.get()).getBannerAd(), status.sPaidStatus, mHomeController.get());
+        mAdManager = new facebookAdsManager(new admobCallback(), ((homeController)mHomeController.get()).getBannerAd(), mHomeController.get());
         mAnalyticsManager = new analyticManager(mHomeController,new analyticCallback(), status.sDeveloperBuild);
         mMessageManager = new messageManager(new messageCallback());
         mOrbotManager = orbotManager.getInstance();
@@ -108,15 +110,19 @@ public class pluginController
         @Override
         public Object invokeObserver(List<Object> data, Object event_type)
         {
-            if(event_type.equals(M_SHOW_LOADED_ADS))
-                ((homeController)mHomeController.get()).onSetBannerAdMargin();
+            if(event_type.equals(M_ON_AD_CLICK)){
+                helperMethod.onMinimizeApp(mHomeController.get());
+            }
+            else if(event_type.equals(M_ON_AD_LOAD)){
+                activityContextManager.getInstance().getHomeController().onUpdateBannerAdvert();
+            }
             return null;
         }
     }
 
     public Object onAdsInvoke(List<Object> pData, pluginEnums.eAdManager pEventType){
         if(mAdManager !=null){
-            return mAdManager.onTrigger(pData, pEventType);
+            return mAdManager.onTrigger(pEventType);
         }
         return null;
     }
@@ -314,6 +320,24 @@ public class pluginController
             else if(pEventType.equals(M_UNDO_TAB)){
                 activityContextManager.getInstance().getTabController().onRestoreTab(null);
             }
+            else if(pEventType.equals(M_SECURITY_INFO)){
+                mMessageManager.onTrigger(Arrays.asList(activityContextManager.getInstance().getHomeController().getSecurityInfo(),mHomeController.get()),M_SECURITY_INFO);
+            }
+            else if(pEventType.equals(M_IMAGE_UPDATE_RESTART)){
+                ((AppCompatActivity)pData.get(0)).finish();
+                activityContextManager.getInstance().getSettingController().finish();
+                activityContextManager.getInstance().getHomeController().quitApplication();
+                new Thread(){
+                    public void run(){
+                        try {
+                            sleep(500);
+                            android.os.Process.killProcess(android.os.Process.myPid());
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }.start();
+            }
             return null;
         }
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java
index 3110d4d3..e40daa3d 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java
@@ -4,10 +4,10 @@ public class pluginEnums
 {
     /*Advert Manager*/
     public enum eAdManager {
-        M_INITIALIZE_BANNER_ADS, M_IS_ADVERT_LOADED
+        M_INITIALIZE_BANNER_ADS, M_IS_ADVERT_LOADED, M_DESTROY
     }
     public enum eAdManagerCallbacks {
-        M_SHOW_LOADED_ADS
+        M_ON_AD_CLICK, M_ON_AD_LOAD
     }
 
 
@@ -28,10 +28,10 @@ public class pluginEnums
 
     /*Message Manager*/
     public enum eMessageManager{
-        M_RESET, M_DATA_CLEARED, M_APPLICATION_CRASH, M_DELETE_BOOKMARK, M_UPDATE_BOOKMARK, M_SECURE_CONNECTION, M_POPUP_BLOCKED, M_PANIC, M_MAX_TAB_REACHED, M_ORBOT_LOADING, M_LOAD_NEW_TAB, M_UNDO,M_DOWNLOAD_SINGLE, M_UPDATE_BRIDGES, M_NEW_IDENTITY, M_NOT_SUPPORTED, M_BRIDGE_MAIL, M_LONG_PRESS_WITH_LINK, M_LONG_PRESS_URL, M_LONG_PRESS_DOWNLOAD, M_START_ORBOT, M_DOWNLOAD_FAILURE, M_DOWNLOAD_FILE, M_RATE_APP, M_REPORT_URL, M_CLEAR_BOOKMARK, M_CLEAR_HISTORY, M_BOOKMARK, M_PANIC_RESET, M_OPEN_LOGS, M_RATE_SUCCESS, M_RATE_FAILURE, M_LANGUAGE_SUPPORT_FAILURE, M_WELCOME
+        M_RESET, M_DATA_CLEARED, M_APPLICATION_CRASH, M_DELETE_BOOKMARK, M_UPDATE_BOOKMARK, M_IMAGE_UPDATE, M_SECURE_CONNECTION, M_SECURITY_INFO, M_POPUP_BLOCKED, M_PANIC, M_MAX_TAB_REACHED, M_ORBOT_LOADING, M_LOAD_NEW_TAB, M_UNDO,M_DOWNLOAD_SINGLE, M_UPDATE_BRIDGES, M_NEW_IDENTITY, M_NOT_SUPPORTED, M_BRIDGE_MAIL, M_LONG_PRESS_WITH_LINK, M_LONG_PRESS_URL, M_LONG_PRESS_DOWNLOAD, M_START_ORBOT, M_DOWNLOAD_FAILURE, M_DOWNLOAD_FILE, M_RATE_APP, M_REPORT_URL, M_CLEAR_BOOKMARK, M_CLEAR_HISTORY, M_BOOKMARK, M_PANIC_RESET, M_OPEN_LOGS, M_RATE_SUCCESS, M_RATE_FAILURE, M_LANGUAGE_SUPPORT_FAILURE, M_WELCOME
     }
     public enum eMessageManagerCallbacks{
-        M_CANCEL_WELCOME, M_APP_RATED, M_DOWNLOAD_FILE_MANUAL, M_OPEN_LINK_CURRENT_TAB, M_COPY_LINK, M_REQUEST_BRIDGES, M_SET_BRIDGES, M_OPEN_LINK_NEW_TAB, M_CLEAR_TAB, M_RATE_APPLICATION, M_OPEN_PRIVACY, M_UNDO_SESSION, M_UNDO_TAB, M_CUSTOM_BRIDGE, M_BRIDGE_TYPE
+        M_CANCEL_WELCOME, M_APP_RATED, M_DOWNLOAD_FILE_MANUAL, M_OPEN_LINK_CURRENT_TAB, M_COPY_LINK, M_REQUEST_BRIDGES, M_SET_BRIDGES, M_OPEN_LINK_NEW_TAB, M_CLEAR_TAB, M_RATE_APPLICATION, M_OPEN_PRIVACY, M_UNDO_SESSION, M_UNDO_TAB, M_CUSTOM_BRIDGE, M_BRIDGE_TYPE, M_DATA_CLEARED_EXTERNAL, M_IMAGE_UPDATE_RESTART
     }
 
     /*Download Manager*/
diff --git a/app/src/main/res/anim/popup_scale_in.xml b/app/src/main/res/anim/popup_scale_in.xml
index 01e6c99a..133ca1d2 100644
--- a/app/src/main/res/anim/popup_scale_in.xml
+++ b/app/src/main/res/anim/popup_scale_in.xml
@@ -4,7 +4,7 @@
     android:fillEnabled="true">
 
     <scale
-        android:duration="200"
+        android:duration="150"
         android:fromXScale="0.95"
         android:fromYScale="0.95"
         android:pivotX="50%"
@@ -16,6 +16,6 @@
     <alpha android:fromAlpha="0"
         android:toAlpha="1.0"
         android:interpolator="@android:anim/accelerate_interpolator"
-        android:duration="200"
+        android:duration="100"
         android:repeatCount="0"/>
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/popup_scale_in_dialog.xml b/app/src/main/res/anim/popup_scale_in_dialog.xml
new file mode 100644
index 00000000..4afd51eb
--- /dev/null
+++ b/app/src/main/res/anim/popup_scale_in_dialog.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true"
+    android:fillEnabled="true">
+
+    <translate
+        android:duration="200"
+        android:fromXDelta="0%"
+        android:fromYDelta="-10%"
+        android:toXDelta="0%"
+        android:toYDelta="0%"
+        />
+
+    <alpha android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="250"
+        android:repeatCount="0"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/popup_scale_out.xml b/app/src/main/res/anim/popup_scale_out.xml
index f65b86bf..6d83eff6 100644
--- a/app/src/main/res/anim/popup_scale_out.xml
+++ b/app/src/main/res/anim/popup_scale_out.xml
@@ -4,7 +4,7 @@
     android:fillEnabled="true">
 
     <scale
-        android:duration="250"
+        android:duration="150"
         android:fromXScale="1"
         android:fromYScale="1"
         android:pivotX="50%"
@@ -16,6 +16,6 @@
     <alpha android:fromAlpha="1.0"
         android:toAlpha="0.0"
         android:interpolator="@android:anim/accelerate_interpolator"
-        android:duration="250"
+        android:duration="100"
         android:repeatCount="0"/>
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/popup_scale_out_dialog.xml b/app/src/main/res/anim/popup_scale_out_dialog.xml
new file mode 100644
index 00000000..958e1e06
--- /dev/null
+++ b/app/src/main/res/anim/popup_scale_out_dialog.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true"
+    android:fillEnabled="true">
+
+    <translate
+        android:duration="100"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="0%"
+        android:toYDelta="0%"
+        />
+
+    <alpha android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="250"
+        android:repeatCount="0"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/push_anim_in.xml b/app/src/main/res/anim/push_anim_in.xml
index f9c8768e..a1e4930c 100644
--- a/app/src/main/res/anim/push_anim_in.xml
+++ b/app/src/main/res/anim/push_anim_in.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate xmlns:android="http://schemas.android.com/apk/res/android"
-        android:fromXDelta="-100%"
-        android:toXDelta="0"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="250"/>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <scale
+        android:duration="150"
+        android:fromXScale="1"
+        android:fromYScale="1"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:toXScale="0.9"
+        android:toYScale="0.9"
+        />
+    <alpha android:fromAlpha="1"
+        android:toAlpha="0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="100"
+        android:repeatCount="0"/>
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/push_anim_in_reverse.xml b/app/src/main/res/anim/push_anim_in_reverse.xml
deleted file mode 100644
index d796f98d..00000000
--- a/app/src/main/res/anim/push_anim_in_reverse.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="250"
-        android:fromXDelta="0%"
-        android:fromYDelta="0%"
-        android:toXDelta="-100%"
-        android:toYDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/push_anim_out.xml b/app/src/main/res/anim/push_anim_out.xml
index 698f9e94..2ba5f80f 100644
--- a/app/src/main/res/anim/push_anim_out.xml
+++ b/app/src/main/res/anim/push_anim_out.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate xmlns:android="http://schemas.android.com/apk/res/android"
-        android:fromXDelta="0"
-        android:toXDelta="100%"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="250"/>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <scale
+        android:duration="150"
+        android:fromXScale="1.1"
+        android:fromYScale="1.1"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:toXScale="1"
+        android:toYScale="1"
+        />
+    <alpha android:fromAlpha="0"
+        android:toAlpha="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="100"
+        android:repeatCount="0"/>
+
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/push_anim_out_reverse.xml b/app/src/main/res/anim/push_anim_out_reverse.xml
deleted file mode 100644
index aea81c60..00000000
--- a/app/src/main/res/anim/push_anim_out_reverse.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="250"
-        android:fromXDelta="100%"
-        android:fromYDelta="0%"
-        android:toXDelta="0%"
-        android:toYDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_in.xml b/app/src/main/res/anim/slide_in.xml
index cb91a4e7..d796f98d 100755
--- a/app/src/main/res/anim/slide_in.xml
+++ b/app/src/main/res/anim/slide_in.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<translate
-        xmlns:android="http://schemas.android.com/apk/res/android"
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
         android:duration="250"
-        android:fromXDelta="100%p"
-        android:toXDelta="0%p"/>
\ No newline at end of file
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="-100%"
+        android:toYDelta="0%" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/translate_fade_left.xml b/app/src/main/res/anim/translate_fade_left.xml
new file mode 100644
index 00000000..b16c828d
--- /dev/null
+++ b/app/src/main/res/anim/translate_fade_left.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="200"
+        android:fromXDelta="5%"
+        android:fromYDelta="0%"
+        android:toXDelta="0%"
+        android:toYDelta="0%"
+        />
+    <alpha android:fromAlpha="0"
+        android:toAlpha="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="200"
+        android:repeatCount="0"/>
+
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/translate_fade_left_reverse.xml b/app/src/main/res/anim/translate_fade_left_reverse.xml
new file mode 100644
index 00000000..c0025498
--- /dev/null
+++ b/app/src/main/res/anim/translate_fade_left_reverse.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="200"
+        android:fromXDelta="-5%"
+        android:fromYDelta="0%"
+        android:toXDelta="0%"
+        android:toYDelta="0%"
+        />
+    <alpha android:fromAlpha="0"
+        android:toAlpha="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="200"
+        android:repeatCount="0"/>
+
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/translate_fade_right.xml b/app/src/main/res/anim/translate_fade_right.xml
new file mode 100644
index 00000000..457ee794
--- /dev/null
+++ b/app/src/main/res/anim/translate_fade_right.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="200"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="5%"
+        android:toYDelta="0%"
+        />
+    <alpha android:fromAlpha="1"
+        android:toAlpha="0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="200"
+        android:repeatCount="0"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/translate_fade_right_reverse.xml b/app/src/main/res/anim/translate_fade_right_reverse.xml
new file mode 100644
index 00000000..6616aac8
--- /dev/null
+++ b/app/src/main/res/anim/translate_fade_right_reverse.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="200"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="-5%"
+        android:toYDelta="0%"
+        />
+    <alpha android:fromAlpha="1"
+        android:toAlpha="0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="200"
+        android:repeatCount="0"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_bottom_neutral.xml b/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_bottom_neutral.xml
new file mode 100644
index 00000000..7e769193
--- /dev/null
+++ b/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_bottom_neutral.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/c_secure_alert_button_pressed">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/c_secure_alert_button_pressed" />
+            <corners android:radius="3.5dp" />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <gradient
+                android:angle="90"
+                android:endColor="@color/c_secure_alert_button"
+                android:startColor="@color/c_secure_alert_button"
+                android:type="linear" />
+            <corners android:radius="3.5dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/custom-xml/alert/xml/ax_round_corner_secure.xml b/app/src/main/res/custom-xml/alert/xml/ax_round_corner_secure.xml
new file mode 100644
index 00000000..b75e782b
--- /dev/null
+++ b/app/src/main/res/custom-xml/alert/xml/ax_round_corner_secure.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Bottom 2dp Shadow -->
+    <item>
+        <shape  android:shape="rectangle">
+
+            <solid android:color="@color/c_secure_alert_border" />
+            <corners android:radius="0dp" />
+
+        </shape>
+    </item>
+
+    <!-- White Top color -->
+    <item android:bottom="4dp" android:left="0px" android:right="0px" android:top="0px">
+
+        <shape  android:shape="rectangle">
+
+            <gradient
+                android:angle="90"
+                android:endColor="@color/c_secure_alert_start"
+                android:startColor="@color/c_secure_alert_end"
+                android:type="linear" />
+            <corners android:radius="0dp" />
+
+
+        </shape>
+
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/generic/xml-v25/shortcuts.xml b/app/src/main/res/custom-xml/generic/xml-v25/shortcuts.xml
index c90d37d8..81d8550e 100644
--- a/app/src/main/res/custom-xml/generic/xml-v25/shortcuts.xml
+++ b/app/src/main/res/custom-xml/generic/xml-v25/shortcuts.xml
@@ -2,7 +2,7 @@
 
 <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
     <shortcut
-        android:shortcutId="Restart"
+        android:shortcutId="CONST_SHORTCUT_RESTART"
         android:enabled="true"
         android:icon="@xml/ic_baseline_shortcut_erase_back"
         android:shortcutShortLabel="@string/shortcut_open"
@@ -11,11 +11,11 @@
             android:action="erase"
             android:targetPackage="com.darkweb.genesissearchengine.production"
             android:targetClass="com.darkweb.genesissearchengine.appManager.externalCommandManager.externalShortcutController">
-            <extra android:name="shortcut" android:value="open" />
+            <extra android:name="EXTERNAL_SHORTCUT_COMMAND" android:value="EXTERNAL_SHORTCUT_COMMAND_RESTART" />
         </intent>
     </shortcut>
     <shortcut
-        android:shortcutId="erase_and_open"
+        android:shortcutId="CONST_SHORTCUT_ERASE_OPEN"
         android:enabled="true"
         android:icon="@xml/ic_baseline_shortcut_add_new_back"
         android:shortcutShortLabel="@string/shortcut_erase_and_open_short_label"
@@ -24,11 +24,11 @@
             android:action="erase"
             android:targetPackage="com.darkweb.genesissearchengine.production"
             android:targetClass="com.darkweb.genesissearchengine.appManager.externalCommandManager.externalShortcutController">
-            <extra android:name="shortcut" android:value="erase_and_open" />
+            <extra android:name="EXTERNAL_SHORTCUT_COMMAND" android:value="EXTERNAL_SHORTCUT_COMMAND_ERASE_OPEN" />
         </intent>
     </shortcut>
     <shortcut
-        android:shortcutId="erase"
+        android:shortcutId="CONST_SHORTCUT_ERASE"
         android:enabled="true"
         android:icon="@xml/ic_baseline_shortcut_cross_back"
         android:shortcutShortLabel="@string/shortcut_erase_short_label"
@@ -37,7 +37,7 @@
             android:action="erase"
             android:targetPackage="com.darkweb.genesissearchengine.production"
             android:targetClass="com.darkweb.genesissearchengine.appManager.externalCommandManager.externalShortcutController">
-            <extra android:name="shortcut" android:value="erase" />
+            <extra android:name="EXTERNAL_SHORTCUT_COMMAND" android:value="EXTERNAL_SHORTCUT_COMMAND_ERASE" />
         </intent>
     </shortcut>
 </shortcuts>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/orbot_log/xml/olx_border_left.xml b/app/src/main/res/custom-xml/orbot_log/xml/olx_border_left.xml
new file mode 100644
index 00000000..ba98ba5c
--- /dev/null
+++ b/app/src/main/res/custom-xml/orbot_log/xml/olx_border_left.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:left="0dp" android:right="-5dp" android:top="-5dp" android:bottom="-5dp">
+        <shape
+            android:shape="rectangle">
+            <stroke android:width="4dp" android:color="@color/c_text_short_header" />
+            <solid android:color="@color/c_orbot_background" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/onion.png b/app/src/main/res/drawable-hdpi/onion.png
new file mode 100644
index 00000000..705ee628
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/onion.png differ
diff --git a/app/src/main/res/layouts/alert/layout-land/certificate_info.xml b/app/src/main/res/layouts/alert/layout-land/certificate_info.xml
new file mode 100644
index 00000000..baf6ad74
--- /dev/null
+++ b/app/src/main/res/layouts/alert/layout-land/certificate_info.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/pCertificateRootBackground"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:alpha="0"
+        android:background="@color/c_secure_alert_background"
+        android:contentDescription="@string/GENERAL_TODO"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintVertical_weight="1" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pCertificateRootLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="10dp"
+        android:background="@xml/ax_round_corner_secure"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/pCertificateRootHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="20dp"
+            android:paddingStart="5dp"
+            android:text="@string/ALERT_CERTIFICATE_HEADER"
+            android:textAlignment="textStart"
+            android:textColor="@color/green_button"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlSymmetry" />
+
+        <ScrollView
+            android:id="@+id/pCertificateScrollView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:paddingTop="10dp"
+            android:fillViewport="true"
+            android:paddingBottom="10dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pCertificateRootHeader">
+
+            <LinearLayout
+                android:id="@+id/pCertificateScroll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/pCertificateDesciption"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginEnd="15dp"
+                    android:alpha="0.6"
+                    android:text="@string/GENERAL_TODO"
+                    android:paddingBottom="100dp"
+                    android:textAlignment="textStart"
+                    android:textColor="@color/c_alert_text"
+                    android:textSize="14sp"
+                    android:translationZ="2dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/pCertificateRootHeader"
+                    tools:ignore="SmallSp" />
+
+            </LinearLayout>
+        </ScrollView>
+
+        <ImageView
+            android:id="@+id/pCertificateRootBlocker"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:clickable="true"
+            android:contentDescription="@string/GENERAL_TODO"
+            android:focusable="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout-land/secure_connection_popup.xml b/app/src/main/res/layouts/alert/layout-land/secure_connection_popup.xml
new file mode 100644
index 00000000..38813c84
--- /dev/null
+++ b/app/src/main/res/layouts/alert/layout-land/secure_connection_popup.xml
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="2000dp">
+
+    <ImageView
+        android:id="@+id/pSecureRootBlocker"
+        android:layout_width="0dp"
+        android:layout_height="2000dp"
+        android:alpha="0"
+        android:background="@color/c_secure_alert_background"
+        android:contentDescription="@string/GENERAL_TODO"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/pSecureRoot"
+        app:layout_constraintVertical_weight="1" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pSecureRoot"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@xml/ax_round_corner_secure"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/pSecureLock"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="15dp"
+            android:contentDescription="@string/GENERAL_TODO"
+            android:src="@drawable/onion"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/pSecureHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="12dp"
+            android:paddingStart="5dp"
+            android:text="@string/ALERT_SECURE_INFO_HEADER"
+            android:textAlignment="textStart"
+            android:textColor="@color/green_button"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toEndOf="@+id/pSecureLock"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlSymmetry" />
+
+        <TextView
+            android:id="@+id/pSecureSubHeader"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="2dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="20dp"
+            android:alpha="0.8"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/GENERAL_TODO"
+            android:textAlignment="textStart"
+            android:textColor="@color/c_alert_text"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintStart_toEndOf="@+id/pSecureHeader"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/pSecureDescription"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="15dp"
+            android:alpha="0.6"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
+            android:text="@string/ALERT_SECURE_INFO_DETAIL"
+            android:textAlignment="textStart"
+            android:textColor="@color/c_alert_text"
+            android:textSize="14sp"
+            android:translationZ="2dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pSecureLock"
+            tools:ignore="SmallSp" />
+
+        <LinearLayout
+            android:id="@+id/pSecureInfo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pSecureDescription">
+
+            <LinearLayout
+                android:id="@+id/pSecureJavascript"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:padding="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/pSecureJavasciptHeader"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="0dp"
+                        android:paddingBottom="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_JAVASCRIPT_HEADER"
+                        android:textAlignment="textStart"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="14sp"
+                        android:translationZ="2dp" />
+
+                    <TextView
+                        android:id="@+id/pSecureJavasciptDescription"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:alpha="0.6"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_JAVASCRIPT_INFO"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="12sp"
+                        android:translationZ="2dp"
+                        tools:ignore="RtlSymmetry" />
+                </LinearLayout>
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/pSecureJavascriptStatus"
+                    android:layout_width="50dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="10dp"
+                    android:alpha="0.2"
+                    android:clickable="false"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:theme="@style/SCBSwitchSecurity" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:alpha="0.8"
+                android:background="@color/c_security_popup_divider"
+                app:layout_constraintBottom_toTopOf="@+id/pSecureNavigation"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <LinearLayout
+                android:id="@+id/pInfoDonottrack"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:padding="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/pSecureNonTrackingHeader"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="0dp"
+                        android:paddingBottom="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_NONTRACKING_HEADER"
+                        android:textAlignment="textStart"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="14sp"
+                        android:translationZ="2dp" />
+
+                    <TextView
+                        android:id="@+id/pSecureNonTrackingDescription"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:alpha="0.6"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_NONTRACKING_INFO"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="12sp"
+                        android:translationZ="2dp"
+                        tools:ignore="RtlSymmetry" />
+                </LinearLayout>
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/pSecureTrackingStatus"
+                    android:layout_width="50dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="10dp"
+                    android:alpha="0.2"
+                    android:clickable="false"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:theme="@style/SCBSwitchSecurity" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:alpha="1"
+                android:background="@color/c_security_popup_divider"
+                app:layout_constraintBottom_toTopOf="@+id/pSecureNavigation"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:padding="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/pSecureTrackingProtectionHeader"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="0dp"
+                        android:paddingBottom="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_TRACKING_HEADER"
+                        android:textAlignment="textStart"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="14sp"
+                        android:translationZ="2dp" />
+
+                    <TextView
+                        android:id="@+id/pSecureTrackingProtectionSubHeader"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:alpha="0.6"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_TRACKING_INFO"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="12sp"
+                        android:translationZ="2dp"
+                        tools:ignore="RtlSymmetry" />
+                </LinearLayout>
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/pSecureTrackingProtectionStatus"
+                    android:layout_width="50dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="10dp"
+                    android:alpha="0.2"
+                    android:clickable="false"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:theme="@style/SCBSwitchSecurity" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:alpha="1"
+            android:background="@color/c_view_divier_background"
+            app:layout_constraintBottom_toTopOf="@+id/pSecureNavigation"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <LinearLayout
+            android:id="@+id/pSecureNavigation"
+            android:layout_width="match_parent"
+            android:layout_height="65dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginBottom="200dp"
+            android:gravity="end"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pSecureInfo">
+
+            <Button
+                android:id="@+id/pSecurePrivacy"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="0dp"
+                android:layout_height="43dp"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginEnd="15dp"
+                android:layout_marginBottom="10dp"
+                android:layout_weight="1"
+                android:background="@xml/ax_ripple_default_round_bottom_neutral"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:padding="0dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
+                android:text="@string/ALERT_SECURE_INFO_SETTINGS"
+                android:textAllCaps="false"
+                android:textColor="@color/c_white"
+                android:textSize="13.5sp"
+                android:textStyle="bold" />
+
+            <Button
+                android:id="@+id/pSecureCertificate"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="0dp"
+                android:layout_height="43dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginEnd="15dp"
+                android:layout_marginBottom="10dp"
+                android:layout_weight="1"
+                android:background="@xml/ax_ripple_default_round_bottom_neutral"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:padding="0dp"
+                android:paddingStart="15dp"
+                android:paddingEnd="10dp"
+                android:text="@string/ALERT_SECURE_INFO_CERTIFICATE"
+                android:textAllCaps="false"
+                android:textColor="@color/c_white"
+                android:textSize="13.5sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/application_crash.xml b/app/src/main/res/layouts/alert/layout/application_crash.xml
index 06267966..6892832b 100644
--- a/app/src/main/res/layouts/alert/layout/application_crash.xml
+++ b/app/src/main/res/layouts/alert/layout/application_crash.xml
@@ -7,7 +7,7 @@
     android:layout_marginBottom="10dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@xml/ax_round_corner"
@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="18dp"
@@ -49,7 +49,7 @@
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layouts/alert/layout/certificate_info.xml b/app/src/main/res/layouts/alert/layout/certificate_info.xml
new file mode 100644
index 00000000..5512838d
--- /dev/null
+++ b/app/src/main/res/layouts/alert/layout/certificate_info.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="2000dp">
+
+    <ImageView
+        android:id="@+id/pCertificateRootBackground"
+        android:layout_width="match_parent"
+        android:layout_height="2000dp"
+        android:alpha="0"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:background="@color/c_secure_alert_background"
+        app:layout_constraintTop_toBottomOf="@+id/pCertificateRootLayout"
+        app:layout_constraintVertical_weight="1"
+        android:contentDescription="@string/GENERAL_TODO" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pCertificateRootLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxHeight="450dp"
+        android:paddingBottom="10dp"
+        android:background="@xml/ax_round_corner_secure"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/pCertificateRootHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="20dp"
+            android:paddingStart="5dp"
+            android:text="@string/ALERT_CERTIFICATE_HEADER"
+            android:textAlignment="textStart"
+            android:textColor="@color/green_button"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlSymmetry" />
+
+        <ScrollView
+            android:id="@+id/pCertificateScrollView"
+            android:layout_width="match_parent"
+            android:layout_height="450dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:paddingTop="10dp"
+            android:fillViewport="true"
+            android:paddingBottom="10dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pCertificateRootHeader">
+
+            <LinearLayout
+                android:id="@+id/pCertificateScroll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/pCertificateDesciption"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginEnd="15dp"
+                    android:alpha="0.6"
+                    android:text="@string/GENERAL_TODO"
+                    android:paddingBottom="100dp"
+                    android:textAlignment="textStart"
+                    android:textColor="@color/c_alert_text"
+                    android:textSize="13sp"
+                    android:translationZ="2dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/pCertificateRootHeader"
+                    tools:ignore="SmallSp" />
+
+            </LinearLayout>
+        </ScrollView>
+
+        <ImageView
+            android:id="@+id/pCertificateRootBlocker"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:clickable="true"
+            android:contentDescription="@string/GENERAL_TODO"
+            android:focusable="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_block_popup.xml b/app/src/main/res/layouts/alert/layout/popup_block_popup.xml
index fa4e4b06..a67eedeb 100644
--- a/app/src/main/res/layouts/alert/layout/popup_block_popup.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_block_popup.xml
@@ -9,7 +9,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="55dp"
         android:layout_marginBottom="10dp"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -32,7 +32,7 @@
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml b/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml
index 05a11071..c9a1e884 100644
--- a/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml
@@ -7,7 +7,7 @@ android:layout_width="match_parent"
 android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="wrap_content"
         android:maxWidth="450dp"
         android:layout_height="wrap_content"
@@ -19,7 +19,7 @@ android:layout_height="match_parent">
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:maxWidth="450dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -52,7 +52,7 @@ android:layout_height="match_parent">
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
         <Button
             android:id="@+id/pTrigger"
@@ -69,7 +69,7 @@ android:layout_height="match_parent">
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/pNext"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_clear_bookmark.xml b/app/src/main/res/layouts/alert/layout/popup_clear_bookmark.xml
index dd651b71..162fc48c 100644
--- a/app/src/main/res/layouts/alert/layout/popup_clear_bookmark.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_clear_bookmark.xml
@@ -9,7 +9,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="55dp"
         android:layout_marginBottom="10dp"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -32,7 +32,7 @@
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_clear_history.xml b/app/src/main/res/layouts/alert/layout/popup_clear_history.xml
index 4c7e5c0a..24c40dec 100644
--- a/app/src/main/res/layouts/alert/layout/popup_clear_history.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_clear_history.xml
@@ -9,7 +9,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="55dp"
         android:layout_marginBottom="10dp"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -32,7 +32,7 @@
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml b/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml
index 1dc1f3a6..2d6a963e 100644
--- a/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@xml/ax_round_corner"
@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="18dp"
@@ -60,7 +60,7 @@
             android:textSize="13sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
         <TextView
             android:id="@+id/pURL"
diff --git a/app/src/main/res/layouts/alert/layout/popup_data_cleared.xml b/app/src/main/res/layouts/alert/layout/popup_data_cleared.xml
index fa45585e..e6962f87 100644
--- a/app/src/main/res/layouts/alert/layout/popup_data_cleared.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_data_cleared.xml
@@ -9,17 +9,17 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="55dp"
-        android:layout_marginBottom="10dp"
+        android:layout_marginBottom="15dp"
         android:background="@xml/ax_toast_alert_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -32,7 +32,7 @@
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_data_cleared_shortcut.xml b/app/src/main/res/layouts/alert/layout/popup_data_cleared_shortcut.xml
index 37cea120..28228ded 100644
--- a/app/src/main/res/layouts/alert/layout/popup_data_cleared_shortcut.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_data_cleared_shortcut.xml
@@ -5,21 +5,24 @@
     android:id="@+id/pToastLayoutRoot"
     android:translationZ="5dp"
     xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/c_background_alpha"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pTDialog"
         android:layout_width="match_parent"
         android:layout_height="55dp"
-        android:layout_marginBottom="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginBottom="15dp"
         android:background="@xml/ax_toast_alert_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pTDDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -32,17 +35,18 @@
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pTDialog"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
         <Button
-            android:id="@+id/pOpenPrivacy"
+            android:id="@+id/pTDDismiss"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginTop="10dp"
             android:layout_marginEnd="10dp"
             android:layout_marginBottom="10dp"
+            android:onClick="onUITrigger"
             android:layout_weight="1"
             android:background="@xml/ax_toast_alert_button"
             android:padding="0dp"
@@ -55,16 +59,17 @@
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="UsingOnClickInXml" />
 
         <View
-            android:id="@+id/view6"
+            android:id="@+id/pTDDivider"
             android:layout_width="1dp"
             android:layout_height="30dp"
             android:layout_marginEnd="10dp"
             android:background="@color/c_alert_divider"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy"
+            app:layout_constraintEnd_toStartOf="@+id/pTDDismiss"
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layouts/alert/layout/popup_download_failure.xml b/app/src/main/res/layouts/alert/layout/popup_download_failure.xml
index cbae290f..35f9fb31 100644
--- a/app/src/main/res/layouts/alert/layout/popup_download_failure.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_download_failure.xml
@@ -9,7 +9,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="55dp"
         android:layout_marginBottom="10dp"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="0dp"
             app:layout_constraintHorizontal_weight="1"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/view6"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_download_full.xml b/app/src/main/res/layouts/alert/layout/popup_download_full.xml
index 12b077d6..52a3fd18 100644
--- a/app/src/main/res/layouts/alert/layout/popup_download_full.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_download_full.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@xml/ax_round_corner"
@@ -41,7 +41,7 @@
         </androidx.cardview.widget.CardView>
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="11dp"
@@ -77,7 +77,7 @@
             android:translationY="-1dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/cardView2"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription"
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription"
             tools:ignore="SmallSp" />
 
         <View
@@ -145,7 +145,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:id="@+id/pOption2"
@@ -192,7 +192,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:id="@+id/pOption3"
@@ -239,7 +239,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:id="@+id/pOption4"
@@ -288,7 +288,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:id="@+id/pOption5"
@@ -337,7 +337,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:id="@+id/pOption6"
@@ -386,7 +386,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:id="@+id/pOption7"
diff --git a/app/src/main/res/layouts/alert/layout/popup_download_url.xml b/app/src/main/res/layouts/alert/layout/popup_download_url.xml
index b9c3633a..087a08a2 100644
--- a/app/src/main/res/layouts/alert/layout/popup_download_url.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_download_url.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
@@ -40,7 +40,7 @@
             app:tint="@color/c_icon_tint" />
 
         <TextView
-            android:id="@+id/pHeader"
+            android:id="@+id/pOrbotRowHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="14dp"
@@ -57,7 +57,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
@@ -73,7 +73,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toEndOf="@+id/imageView2"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowHeader"
             tools:ignore="SmallSp" />
 
         <TextView
@@ -93,7 +93,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toEndOf="@+id/imageView2"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription"
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription"
             tools:ignore="SmallSp" />
 
         <Button
diff --git a/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml b/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml
index 4501bf76..65cd41ac 100644
--- a/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml
@@ -8,7 +8,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_height="wrap_content"
         android:background="@xml/ax_round_corner"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -41,7 +41,7 @@
         </androidx.cardview.widget.CardView>
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
@@ -125,7 +125,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:id="@+id/pOption2"
@@ -171,7 +171,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:id="@+id/pOption3"
@@ -217,7 +217,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:id="@+id/pOption4"
@@ -265,7 +265,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layouts/alert/layout/popup_language_support.xml b/app/src/main/res/layouts/alert/layout/popup_language_support.xml
index f1ae4ae0..3575f78a 100644
--- a/app/src/main/res/layouts/alert/layout/popup_language_support.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_language_support.xml
@@ -9,7 +9,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="55dp"
         android:layout_marginBottom="10dp"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -32,12 +32,12 @@
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
         <Button
-            android:id="@+id/pOpenPrivacy"
+            android:id="@+id/pDismiss"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layouts/alert/layout/popup_load_new_tab.xml b/app/src/main/res/layouts/alert/layout/popup_load_new_tab.xml
index e336bc37..c8926eb6 100644
--- a/app/src/main/res/layouts/alert/layout/popup_load_new_tab.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_load_new_tab.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/pToastLayoutRoot"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/pToastLayoutRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="55dp"
         android:layout_marginBottom="10dp"
@@ -18,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -27,11 +26,11 @@
             android:paddingEnd="15dp"
             android:text="@string/ALERT_OPEN_NEW_TAB"
             android:textAlignment="textStart"
-            android:textColor="@color/c_alert_text_inverted_v1"
+            android:textColor="@color/c_white"
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
@@ -47,7 +46,7 @@
             android:padding="0dp"
             android:text="@string/ALERT_OPEN_NEW_TAB_LOAD"
             android:textAllCaps="false"
-            android:textColor="@color/c_button_text_v1_inverted"
+            android:textColor="@color/c_white"
             android:textSize="15sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -68,5 +67,4 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_max_tab.xml b/app/src/main/res/layouts/alert/layout/popup_max_tab.xml
index 98da050a..f4799858 100644
--- a/app/src/main/res/layouts/alert/layout/popup_max_tab.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_max_tab.xml
@@ -9,7 +9,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_marginBottom="15dp"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -32,7 +32,7 @@
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_new_circuit.xml b/app/src/main/res/layouts/alert/layout/popup_new_circuit.xml
index d6ee02ae..d2342fe0 100644
--- a/app/src/main/res/layouts/alert/layout/popup_new_circuit.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_new_circuit.xml
@@ -9,7 +9,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="55dp"
         android:layout_marginBottom="10dp"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -32,7 +32,7 @@
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_not_supported.xml b/app/src/main/res/layouts/alert/layout/popup_not_supported.xml
index 3ad8286f..e58a91eb 100644
--- a/app/src/main/res/layouts/alert/layout/popup_not_supported.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_not_supported.xml
@@ -9,7 +9,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_marginBottom="15dp"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -32,7 +32,7 @@
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_orbot_connecting.xml b/app/src/main/res/layouts/alert/layout/popup_orbot_connecting.xml
index 1391e8c9..96444715 100644
--- a/app/src/main/res/layouts/alert/layout/popup_orbot_connecting.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_orbot_connecting.xml
@@ -9,7 +9,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_marginBottom="10dp"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
@@ -33,7 +33,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/view6"
             app:layout_constraintHorizontal_weight="1"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_panic.xml b/app/src/main/res/layouts/alert/layout/popup_panic.xml
index cbbf7acb..648a3407 100644
--- a/app/src/main/res/layouts/alert/layout/popup_panic.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_panic.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="wrap_content"
         android:maxWidth="450dp"
         android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:maxWidth="450dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
         <Button
             android:id="@+id/pTrigger"
@@ -69,7 +69,7 @@
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/pNext"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_rate_failure.xml b/app/src/main/res/layouts/alert/layout/popup_rate_failure.xml
index 319db6c3..98d5fb57 100644
--- a/app/src/main/res/layouts/alert/layout/popup_rate_failure.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_rate_failure.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="wrap_content"
         android:maxWidth="450dp"
         android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:maxWidth="450dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
         <Button
             android:id="@+id/pTrigger"
@@ -69,7 +69,7 @@
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/pNext"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_rate_us.xml b/app/src/main/res/layouts/alert/layout/popup_rate_us.xml
index e399216e..9db35d4e 100644
--- a/app/src/main/res/layouts/alert/layout/popup_rate_us.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_rate_us.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@xml/ax_round_corner"
@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <TextView
-            android:id="@+id/pHeader"
+            android:id="@+id/pOrbotRowHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
@@ -33,7 +33,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -47,7 +47,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader">
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowHeader">
 
         </TextView>
 
@@ -64,7 +64,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription">
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription">
 
         </RatingBar>
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_toast_generic.xml b/app/src/main/res/layouts/alert/layout/popup_toast_generic.xml
index 30c7e0d1..b7198046 100644
--- a/app/src/main/res/layouts/alert/layout/popup_toast_generic.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_toast_generic.xml
@@ -9,7 +9,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="0dp"
         app:layout_constraintHorizontal_weight="1"
         android:maxWidth="400dp"
@@ -22,7 +22,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -35,7 +35,7 @@
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_undo.xml b/app/src/main/res/layouts/alert/layout/popup_undo.xml
index 2d025ccf..a1b3a871 100644
--- a/app/src/main/res/layouts/alert/layout/popup_undo.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_undo.xml
@@ -9,7 +9,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="55dp"
         android:layout_marginBottom="10dp"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -28,11 +28,11 @@
             android:paddingEnd="15dp"
             android:text="@string/ALERT_UNDO_TAB_REMOVE_INFO"
             android:textAlignment="textStart"
-            android:textColor="@color/c_alert_toast_info_text"
+            android:textColor="@color/c_white"
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintStart_toStartOf="@+id/pSecureRootLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
@@ -49,7 +49,7 @@
             android:padding="0dp"
             android:text="@string/ALERT_UNDO_TAB_REMOVE_BUTTON"
             android:textAllCaps="false"
-            android:textColor="@color/c_button_text_v1_inverted"
+            android:textColor="@color/c_white"
             android:textSize="15sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -62,7 +62,7 @@
             android:layout_width="1dp"
             android:layout_height="30dp"
             android:layout_marginEnd="10dp"
-            android:background="@color/c_border_background_divider"
+            android:background="#3973ac"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/pUndo"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layouts/alert/layout/popup_update_bridges.xml b/app/src/main/res/layouts/alert/layout/popup_update_bridges.xml
index 76433a72..8dc4931a 100644
--- a/app/src/main/res/layouts/alert/layout/popup_update_bridges.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_update_bridges.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@xml/ax_round_corner"
@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="18dp"
@@ -78,7 +78,7 @@
             android:textSize="14sp"
             app:layout_constraintEnd_toStartOf="@+id/mClear"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
         <EditText
             android:id="@+id/pBridgeType"
@@ -119,7 +119,7 @@
             android:src="@xml/ic_baseline_cross"
             app:layout_constraintBottom_toTopOf="@+id/pDescriptionError"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
         <Button
             android:id="@+id/pBridgeRequest"
diff --git a/app/src/main/res/layouts/alert/layout/popup_url_longpress.xml b/app/src/main/res/layouts/alert/layout/popup_url_longpress.xml
index 843160b7..863ab6a9 100644
--- a/app/src/main/res/layouts/alert/layout/popup_url_longpress.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_url_longpress.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRootLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@xml/ax_round_corner"
@@ -41,7 +41,7 @@
         </androidx.cardview.widget.CardView>
 
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pOrbotRowDescription"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
@@ -123,7 +123,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:id="@+id/pOption2"
@@ -169,7 +169,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:id="@+id/pOption3"
@@ -217,7 +217,7 @@
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+                app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layouts/alert/layout/secure_connection_popup.xml b/app/src/main/res/layouts/alert/layout/secure_connection_popup.xml
index aff14379..73da2b98 100644
--- a/app/src/main/res/layouts/alert/layout/secure_connection_popup.xml
+++ b/app/src/main/res/layouts/alert/layout/secure_connection_popup.xml
@@ -4,347 +4,355 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="2100dp">
+
+    <ImageView
+        android:id="@+id/pSecureRootBlocker"
+        android:layout_width="match_parent"
+        android:layout_height="2100dp"
+        android:alpha="0"
+        android:background="@color/c_secure_alert_background"
+        android:contentDescription="@string/GENERAL_TODO"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/pSecureRoot"
+        app:layout_constraintVertical_weight="1" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
+        android:id="@+id/pSecureRoot"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner_bottom"
+        android:paddingBottom="7dp"
+        android:background="@xml/ax_round_corner_secure"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
-            android:id="@+id/pLock"
+            android:id="@+id/pSecureLock"
             android:layout_width="18dp"
             android:layout_height="18dp"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="14dp"
             android:layout_marginTop="15dp"
             android:contentDescription="@string/GENERAL_TODO"
-            android:src="@xml/ic_baseline_lock"
+            android:src="@drawable/onion"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/c_lock_text" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/pHeader"
+            android:id="@+id/pSecureHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="14dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="12dp"
             android:paddingStart="5dp"
-            android:text="onion:"
+            android:text="@string/ALERT_SECURE_INFO_HEADER"
             android:textAlignment="textStart"
             android:textColor="@color/green_button"
             android:textSize="15sp"
             android:textStyle="bold"
-            app:layout_constraintStart_toEndOf="@+id/pLock"
+            app:layout_constraintStart_toEndOf="@+id/pSecureLock"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="RtlSymmetry" />
 
         <TextView
-            android:id="@+id/pHeaderSubpart"
+            android:id="@+id/pSecureSubHeader"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="2dp"
-            android:layout_marginTop="14dp"
+            android:layout_marginTop="12dp"
             android:layout_marginEnd="20dp"
             android:alpha="0.8"
             android:ellipsize="end"
             android:maxLines="1"
-            android:text="www.bbc.com"
+            android:text="@string/GENERAL_TODO"
             android:textAlignment="textStart"
             android:textColor="@color/c_alert_text"
             android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_weight="1"
-            app:layout_constraintStart_toEndOf="@+id/pHeader"
+            app:layout_constraintStart_toEndOf="@+id/pSecureHeader"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <LinearLayout
-            android:id="@+id/infoContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:background="@xml/ax_border_top"
-            android:orientation="vertical"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription2">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal"
-                android:padding="10dp">
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/pJavaScript"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="0dp"
-                        android:paddingBottom="0dp"
-                        android:text="Javascript"
-                        android:textAlignment="textStart"
-                        android:textColor="@color/c_alert_text"
-                        android:textSize="14sp"
-                        android:translationZ="2dp" />
-
-                    <TextView
-                        android:id="@+id/pJavaScriptInfo"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:alpha="1"
-                        android:background="@android:color/transparent"
-                        android:clickable="false"
-                        android:padding="0dp"
-                        android:text="@string/SETTING_PRIVACY_CLEAR_PRIVATE_HEADER_INFO"
-                        android:textAlignment="textStart"
-                        android:textAllCaps="false"
-                        android:textColor="@color/c_text_v6"
-                        android:textSize="12sp"
-                        android:translationZ="2dp"
-                        tools:ignore="RtlSymmetry" />
-                </LinearLayout>
-
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/pJSStatus"
-                    android:layout_width="50dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="10dp"
-                    android:alpha="0.2"
-                    android:clickable="false"
-                    android:contentDescription="@string/GENERAL_TODO"
-                    android:theme="@style/SCBSwitchSecurity" />
-
-            </LinearLayout>
-
-            <View
-                android:id="@+id/view2"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginStart="3dp"
-                android:alpha="1"
-                android:background="@color/c_security_popup_divider"
-                app:layout_constraintBottom_toTopOf="@+id/pNavigationContainer"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal"
-                android:padding="10dp">
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/pDonotTrack"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="0dp"
-                        android:paddingBottom="0dp"
-                        android:text="Do not track"
-                        android:textAlignment="textStart"
-                        android:textColor="@color/c_alert_text"
-                        android:textSize="14sp"
-                        android:translationZ="2dp" />
-
-                    <TextView
-                        android:id="@+id/pDonotTrackInfo"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:alpha="1"
-                        android:background="@android:color/transparent"
-                        android:clickable="false"
-                        android:padding="0dp"
-                        android:text="@string/SETTING_PRIVACY_DONOT_TRACK_INFO"
-                        android:textAlignment="textStart"
-                        android:textAllCaps="false"
-                        android:textColor="@color/c_text_v6"
-                        android:textSize="12sp"
-                        android:translationZ="2dp"
-                        tools:ignore="RtlSymmetry" />
-                </LinearLayout>
-
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/pDTStatus"
-                    android:layout_width="50dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="10dp"
-                    android:alpha="0.2"
-                    android:clickable="false"
-                    android:contentDescription="@string/GENERAL_TODO"
-                    android:theme="@style/SCBSwitchSecurity" />
-
-            </LinearLayout>
-
-            <View
-                android:id="@+id/view3"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginStart="3dp"
-                android:alpha="1"
-                android:background="@color/c_security_popup_divider"
-                app:layout_constraintBottom_toTopOf="@+id/pNavigationContainer"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal"
-                android:padding="10dp">
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/pTrackingProtection"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="0dp"
-                        android:paddingBottom="0dp"
-                        android:text="Tracking Protection"
-                        android:textAlignment="textStart"
-                        android:textColor="@color/c_alert_text"
-                        android:textSize="14sp"
-                        android:translationZ="2dp" />
-
-                    <TextView
-                        android:id="@+id/pTrackingProtectionInfo"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:alpha="1"
-                        android:background="@android:color/transparent"
-                        android:clickable="false"
-                        android:padding="0dp"
-                        android:text="@string/SETTING_PRIVACY_TRACKING_PROTECTION_INFO"
-                        android:textAlignment="textStart"
-                        android:textAllCaps="false"
-                        android:textColor="@color/c_text_v6"
-                        android:textSize="12sp"
-                        android:translationZ="2dp"
-                        tools:ignore="RtlSymmetry" />
-                </LinearLayout>
-
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/pTPStatus"
-                    android:layout_width="50dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="10dp"
-                    android:alpha="0.2"
-                    android:clickable="false"
-                    android:contentDescription="@string/GENERAL_TODO"
-                    android:theme="@style/SCBSwitchSecurity" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
         <TextView
-            android:id="@+id/pDescription"
+            android:id="@+id/pSecureDescription"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="20dp"
+            android:layout_marginEnd="15dp"
             android:alpha="0.6"
-            android:visibility="gone"
-            android:paddingEnd="10dp"
-            android:text="@string/ALERT_SECURE_INFO"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_alert_text"
-            android:textSize="16sp"
-            android:translationZ="2dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pLock"
-            tools:ignore="SmallSp" />
-
-        <TextView
-            android:id="@+id/pDescription2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="11dp"
-            android:layout_marginTop="12dp"
-            android:alpha="0.6"
+            android:paddingStart="10dp"
             android:paddingEnd="10dp"
             android:text="@string/ALERT_SECURE_INFO_DETAIL"
             android:textAlignment="textStart"
             android:textColor="@color/c_alert_text"
             android:textSize="14sp"
             android:translationZ="2dp"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription"
+            app:layout_constraintTop_toBottomOf="@+id/pSecureLock"
             tools:ignore="SmallSp" />
 
+        <LinearLayout
+            android:id="@+id/pSecureInfo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pSecureDescription">
+
+            <LinearLayout
+                android:id="@+id/pSecureJavascript"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:padding="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/pSecureJavasciptHeader"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="0dp"
+                        android:paddingBottom="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_JAVASCRIPT_HEADER"
+                        android:textAlignment="textStart"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="14sp"
+                        android:translationZ="2dp" />
+
+                    <TextView
+                        android:id="@+id/pSecureJavasciptDescription"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:alpha="0.6"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_JAVASCRIPT_INFO"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="12sp"
+                        android:translationZ="2dp"
+                        tools:ignore="RtlSymmetry" />
+                </LinearLayout>
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/pSecureJavascriptStatus"
+                    android:layout_width="50dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="10dp"
+                    android:alpha="0.2"
+                    android:clickable="false"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:theme="@style/SCBSwitchSecurity" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:alpha="0.8"
+                android:background="@color/c_security_popup_divider"
+                app:layout_constraintBottom_toTopOf="@+id/pSecureNavigation"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <LinearLayout
+                android:id="@+id/pInfoDonottrack"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:padding="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/pSecureNonTrackingHeader"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="0dp"
+                        android:paddingBottom="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_NONTRACKING_HEADER"
+                        android:textAlignment="textStart"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="14sp"
+                        android:translationZ="2dp" />
+
+                    <TextView
+                        android:id="@+id/pSecureNonTrackingDescription"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:alpha="0.6"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_NONTRACKING_INFO"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="12sp"
+                        android:translationZ="2dp"
+                        tools:ignore="RtlSymmetry" />
+                </LinearLayout>
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/pSecureTrackingStatus"
+                    android:layout_width="50dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="10dp"
+                    android:alpha="0.2"
+                    android:clickable="false"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:theme="@style/SCBSwitchSecurity" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:alpha="1"
+                android:background="@color/c_security_popup_divider"
+                app:layout_constraintBottom_toTopOf="@+id/pSecureNavigation"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:padding="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/pSecureTrackingProtectionHeader"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="0dp"
+                        android:paddingBottom="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_TRACKING_HEADER"
+                        android:textAlignment="textStart"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="14sp"
+                        android:translationZ="2dp" />
+
+                    <TextView
+                        android:id="@+id/pSecureTrackingProtectionSubHeader"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:alpha="0.6"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:text="@string/ALERT_SECURE_INFO_TRACKING_INFO"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/c_alert_text"
+                        android:textSize="12sp"
+                        android:translationZ="2dp"
+                        tools:ignore="RtlSymmetry" />
+                </LinearLayout>
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/pSecureTrackingProtectionStatus"
+                    android:layout_width="50dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="10dp"
+                    android:alpha="0.2"
+                    android:clickable="false"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:theme="@style/SCBSwitchSecurity" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
         <View
-            android:id="@+id/pNavigationContainerTopBorder"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:alpha="1"
             android:background="@color/c_view_divier_background"
-            app:layout_constraintBottom_toTopOf="@+id/pNavigationContainer"
+            app:layout_constraintBottom_toTopOf="@+id/pSecureNavigation"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
         <LinearLayout
-            android:id="@+id/pNavigationContainer"
+            android:id="@+id/pSecureNavigation"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="65dp"
             android:layout_marginTop="30dp"
+            android:gravity="end"
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/infoContainer">
+            app:layout_constraintTop_toBottomOf="@+id/pSecureInfo">
 
             <Button
-                android:id="@+id/pTrigger"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:id="@+id/pSecurePrivacy"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="0dp"
+                android:layout_height="38dp"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginEnd="15dp"
+                android:layout_marginBottom="10dp"
                 android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_left"
+                android:background="@xml/ax_ripple_default_round_bottom_neutral"
                 android:padding="0dp"
-                android:text="@string/ALERT_DISMISS"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
+                android:text="@string/ALERT_SECURE_INFO_SETTINGS"
+                android:maxLines="1"
+                android:ellipsize="end"
                 android:textAllCaps="false"
-                android:textColor="@color/c_alert_toast_button_background"
-                android:textSize="14sp"
+                android:textColor="@color/c_white"
+                android:textSize="13.5sp"
                 android:textStyle="bold" />
 
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
             <Button
-                android:id="@+id/pNext"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:id="@+id/pSecureCertificate"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="0dp"
+                android:layout_height="38dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginEnd="15dp"
+                android:layout_marginBottom="10dp"
                 android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_right"
+                android:background="@xml/ax_ripple_default_round_bottom_neutral"
                 android:padding="0dp"
-                android:text="@string/ALERT_SECURE_INFO_SETTINGS"
+                android:paddingStart="15dp"
+                android:paddingEnd="10dp"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:text="@string/ALERT_SECURE_INFO_CERTIFICATE"
                 android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v3"
-                android:textSize="14sp"
+                android:textColor="@color/c_white"
+                android:textSize="13.5sp"
                 android:textStyle="bold" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml b/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml
index a73f358f..022244b3 100644
--- a/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml
+++ b/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml
@@ -87,7 +87,7 @@
                 tools:ignore="NestedWeights,RtlSymmetry">
 
                 <TextView
-                    android:id="@+id/pHeader"
+                    android:id="@+id/pOrbotRowHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/c_text_v1"
@@ -99,7 +99,7 @@
 
                 <TextView
                     android:layout_marginStart="10dp"
-                    android:id="@+id/pDescription"
+                    android:id="@+id/pOrbotRowDescription"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
diff --git a/app/src/main/res/layouts/bookmark/layout/bookmark_setting_view.xml b/app/src/main/res/layouts/bookmark/layout/bookmark_setting_view.xml
index 4b105247..e0b58fb9 100644
--- a/app/src/main/res/layouts/bookmark/layout/bookmark_setting_view.xml
+++ b/app/src/main/res/layouts/bookmark/layout/bookmark_setting_view.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/c_background"
-    tools:context="com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings.bookmarkSettingController">
+    tools:context="com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkSettings.bookmarkSettingController">
     <ScrollView
         android:id="@+id/pScrollView"
         android:layout_width="match_parent"
@@ -41,7 +41,7 @@
                     tools:ignore="UsingOnClickInXml" />
 
                 <TextView
-                    android:id="@+id/pHeader"
+                    android:id="@+id/pOrbotRowHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginTop="-3dp"
diff --git a/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml b/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
index 702d692a..045c8ee5 100644
--- a/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
+++ b/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
@@ -37,9 +37,10 @@
                 android:layout_marginTop="1dp"
                 android:background="@xml/gx_ripple_default_round"
                 android:contentDescription="@string/GENERAL_TODO"
-                android:onClick="onBackPressed"
+                android:onClick="onClose"
                 android:src="@xml/ic_arrow_back"
-                android:tint="@color/c_navigation_tint" />
+                app:tint="@color/c_navigation_tint"
+                tools:ignore="UsingOnClickInXml" />
 
             <TextView
                 android:id="@+id/pTitle"
@@ -49,11 +50,12 @@
                 android:layout_marginStart="2dp"
                 android:layout_marginEnd="20dp"
                 android:gravity="center_vertical|start"
-                android:onClick="onBackPressed"
+                android:onClick="onClose"
                 android:text="@string/BOOKMARK_TITLE"
                 android:textColor="@color/c_text_v1"
                 android:textSize="17sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                tools:ignore="UsingOnClickInXml" />
 
             <com.darkweb.genesissearchengine.appManager.homeManager.homeController.editTextManager
                 android:id="@+id/pSearchInput"
@@ -99,7 +101,8 @@
                 android:paddingBottom="10dp"
                 android:scaleType="fitCenter"
                 android:src="@xml/ic_search"
-                android:tint="@color/c_navigation_tint" />
+                app:tint="@color/c_navigation_tint"
+                tools:ignore="UsingOnClickInXml" />
 
             <ImageButton
                 android:id="@+id/pMenuButton"
@@ -115,7 +118,8 @@
                 android:paddingBottom="14dp"
                 android:scaleType="fitCenter"
                 android:src="@drawable/menu_item"
-                android:tint="@color/c_navigation_tint" />
+                app:tint="@color/c_navigation_tint"
+                tools:ignore="UsingOnClickInXml" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml b/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
index d7b57857..7ac2fddc 100644
--- a/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
+++ b/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
@@ -32,16 +32,16 @@
                 <ImageButton
                     android:layout_width="45dp"
                     android:layout_height="50dp"
-                    android:onClick="onCloseTrigger"
+                    android:onClick="onClose"
                     android:layout_marginTop="3dp"
                     android:layout_marginStart="3dp"
-                    android:tint="@color/c_navigation_tint"
                     android:src="@xml/ic_arrow_back"
                     android:background="@xml/gx_ripple_default_round"
-                    android:contentDescription="@string/GENERAL_TODO"/>
+                    android:contentDescription="@string/GENERAL_TODO"
+                    app:tint="@color/c_navigation_tint" />
                 <TextView
                     android:textColor="@color/c_text_v1"
-                    android:onClick="onCloseTrigger"
+                    android:onClick="onClose"
                     android:textSize="17sp"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
diff --git a/app/src/main/res/layouts/help/layout/help_view.xml b/app/src/main/res/layouts/help/layout/help_view.xml
index f035abdc..0d2a74f2 100644
--- a/app/src/main/res/layouts/help/layout/help_view.xml
+++ b/app/src/main/res/layouts/help/layout/help_view.xml
@@ -92,9 +92,9 @@
             android:src="@xml/ic_baseline_browser"
             android:text="@string/HELP_RETRY"
             android:textColor="@color/c_white"
-            android:tint="@color/c_white"
             app:layout_constraintStart_toEndOf="@+id/pReloadButton"
-            app:layout_constraintTop_toTopOf="@+id/pReloadButton" />
+            app:layout_constraintTop_toTopOf="@+id/pReloadButton"
+            app:tint="@color/c_white" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
@@ -120,9 +120,9 @@
             android:layout_marginTop="1dp"
             android:background="@xml/gx_ripple_default_round"
             android:contentDescription="@string/GENERAL_TODO"
-            android:onClick="onCloseTrigger"
+            android:onClick="onClose"
             android:src="@xml/ic_arrow_back"
-            android:tint="@color/c_navigation_tint" />
+            app:tint="@color/c_navigation_tint" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -130,7 +130,7 @@
             android:layout_marginTop="-3dp"
             android:layout_marginEnd="10dp"
             android:gravity="center_vertical|start"
-            android:onClick="onCloseTrigger"
+            android:onClick="onClose"
             android:text="@string/HELP_TITLE"
             android:textColor="@color/c_text_v1"
             android:textSize="17sp"
diff --git a/app/src/main/res/layouts/history/layout/empty_view.xml b/app/src/main/res/layouts/history/layout/empty_view.xml
index b7375e3a..f1b3391a 100644
--- a/app/src/main/res/layouts/history/layout/empty_view.xml
+++ b/app/src/main/res/layouts/history/layout/empty_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pSecureRootLayout"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/history/layout/history_view.xml b/app/src/main/res/layouts/history/layout/history_view.xml
index 17958522..c3893946 100644
--- a/app/src/main/res/layouts/history/layout/history_view.xml
+++ b/app/src/main/res/layouts/history/layout/history_view.xml
@@ -39,7 +39,7 @@
                 android:contentDescription="@string/GENERAL_TODO"
                 android:onClick="onBackPressed"
                 android:src="@xml/ic_arrow_back"
-                android:tint="@color/c_navigation_tint" />
+                app:tint="@color/c_navigation_tint" />
 
             <TextView
                 android:id="@+id/pTitle"
@@ -99,7 +99,7 @@
                 android:paddingBottom="10dp"
                 android:scaleType="fitCenter"
                 android:src="@xml/ic_search"
-                android:tint="@color/c_navigation_tint" />
+                app:tint="@color/c_navigation_tint" />
 
             <ImageButton
                 android:id="@+id/pMenuButton"
@@ -115,7 +115,7 @@
                 android:paddingBottom="14dp"
                 android:scaleType="fitCenter"
                 android:src="@drawable/menu_item"
-                android:tint="@color/c_navigation_tint" />
+                app:tint="@color/c_navigation_tint" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layouts/home/layout/hint_view.xml b/app/src/main/res/layouts/home/layout/hint_view.xml
index 3bb2126c..b371a11b 100644
--- a/app/src/main/res/layouts/home/layout/hint_view.xml
+++ b/app/src/main/res/layouts/home/layout/hint_view.xml
@@ -40,24 +40,30 @@
                 app:srcCompat="@xml/ic_baseline_search"
                 app:tint="@color/c_navigation_tint" />
 
-            <ImageView
+            <androidx.cardview.widget.CardView
                 android:id="@+id/pHintWebIcon"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:layout_marginStart="13dp"
-                android:layout_marginTop="1dp"
-                android:layout_marginBottom="3dp"
-                android:background="@xml/hox_round_outline"
-                android:contentDescription="@string/GENERAL_TODO"
-                android:src="@xml/ic_baseline_browser"
+                android:layout_marginLeft="14dp"
+                app:cardCornerRadius="3dp"
+                android:background="@color/c_background"
+                app:cardElevation="0dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/pHindTypeIcon"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.578"
-                app:tint="@color/c_text_v6" />
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:id="@+id/pHintWebIconImage"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/c_background"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:src="@xml/ic_baseline_browser"
+                    app:tint="@color/c_text_v6" />
+            </androidx.cardview.widget.CardView>
 
             <TextView
-                android:id="@+id/pHeader"
+                android:id="@+id/pOrbotRowHeader"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
@@ -131,9 +137,9 @@
             android:onClick="onSuggestionMove"
             android:layout_margin="2dp"
             android:background="@xml/gx_ripple_default_round"
-            android:tint="@color/c_navigation_tint"
             android:rotation="225"
-            android:contentDescription="@string/GENERAL_TODO" />
+            android:contentDescription="@string/GENERAL_TODO"
+            app:tint="@color/c_navigation_tint" />
 
 
     </LinearLayout>
diff --git a/app/src/main/res/layouts/home/layout/home_view.xml b/app/src/main/res/layouts/home/layout/home_view.xml
index 1437ab6d..ec1772f7 100644
--- a/app/src/main/res/layouts/home/layout/home_view.xml
+++ b/app/src/main/res/layouts/home/layout/home_view.xml
@@ -2,229 +2,228 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/pRootLayout"
+    android:id="@+id/pSecureRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/c_background_keyboard"
     tools:context="com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController">
 
+    <LinearLayout
+        android:id="@+id/adView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        app:adUnitId="ca-app-pub-5074525529134731/8952142500"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/pCoordinatorLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="@color/c_background_keyboard"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toBottomOf="@+id/adView">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/pAppbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/c_background"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             android:fitsSystemWindows="true"
-            app:layout_scrollFlags="enterAlwaysCollapsed"
-            android:translationZ="3dp">
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            android:translationZ="3dp"
+            app:layout_scrollFlags="enterAlwaysCollapsed">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/fProfilCollapsing"
                 android:layout_width="match_parent"
-                app:scrimAnimationDuration="10"
                 android:layout_height="match_parent"
                 android:gravity="center"
+                android:orientation="vertical"
                 app:layout_scrollFlags="enterAlwaysCollapsed"
-                android:orientation="vertical">
+                app:scrimAnimationDuration="10">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/pTopLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/c_background"
-                android:clipToPadding="true"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_scrollFlags="enterAlwaysCollapsed"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <LinearLayout
-                    android:id="@+id/pTopbar"
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/pTopLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/c_background"
-                    android:elevation="4dp"
-                    android:gravity="start"
-                    android:orientation="vertical"
+                    android:clipToPadding="true"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:ignore="RtlHardcoded,UselessParent">
+                    app:layout_scrollFlags="enterAlwaysCollapsed">
 
                     <LinearLayout
-                        android:id="@+id/pTopBarContainer"
+                        android:id="@+id/pTopbar"
                         android:layout_width="match_parent"
-                        android:layout_height="60dp"
-                        android:animateLayoutChanges="true"
+                        android:layout_height="wrap_content"
+                        android:background="@color/c_background"
+                        android:elevation="4dp"
                         android:gravity="start"
-                        android:orientation="horizontal"
+                        android:orientation="vertical"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
                         tools:ignore="RtlHardcoded,UselessParent">
 
-                        <ImageButton
-                            android:id="@+id/pSearchLogo"
-                            android:layout_width="33dp"
-                            android:layout_height="33dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginStart="14dp"
-                            android:background="@xml/gx_ripple_default_round"
-                            android:contentDescription="@string/GENERAL_TODO"
-                            android:onClick="onLockSecure"
-                            android:padding="6dp"
-                            android:scaleType="fitCenter"
-                            android:src="@xml/ic_baseline_lock"
-                            android:translationZ="10dp"
-                            app:tint="@color/c_lock_tint"
-                            tools:ignore="RtlSymmetry" />
-
-                        <View
-                            android:id="@+id/pSearchDivider"
-                            android:layout_width="1px"
-                            android:translationZ="1dp"
-                            android:layout_height="20dp"
-                            android:layout_marginLeft="3dp"
-                            android:layout_gravity="center_vertical"
-                            android:background="@color/c_text_v6"
-                            tools:ignore="RtlSymmetry" />
-
-                        <com.darkweb.genesissearchengine.appManager.homeManager.homeController.editTextManager
-                            android:id="@+id/pSearchInput"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginStart="-41dp"
-                            android:layout_marginTop="8dp"
-                            android:imeOptions="flagNoExtractUi"
-                            android:layout_marginEnd="5dp"
-                            android:layout_marginBottom="8dp"
-                            android:layout_weight="1"
+                        <LinearLayout
+                            android:id="@+id/pTopBarContainer"
+                            android:layout_width="match_parent"
+                            android:layout_height="60dp"
                             android:animateLayoutChanges="true"
-                            android:background="@xml/gx_generic_input"
-                            android:completionHintView="@layout/hint_view"
-                            android:dropDownAnchor="@id/pSearchEngineBar"
-                            android:ems="10"
-                            android:fadingEdgeLength="20dp"
-                            android:focusableInTouchMode="true"
-                            android:focusedByDefault="false"
-                            android:hint="@string/GENERAL_SEARCH_HINT"
-                            android:importantForAutofill="no"
-                            android:inputType="textNoSuggestions"
-                            android:maxLines="1"
-                            android:paddingStart="52dp"
-                            android:paddingEnd="15dp"
-                            android:paddingBottom="2dp"
-                            android:popupElevation="0dp"
-                            android:requiresFadingEdge="horizontal"
-                            android:selectAllOnFocus="true"
-                            android:text="@string/GENERAL_HOME_URL"
-                            android:textColor="@color/c_text_v1"
-                            android:textColorHighlight="@color/c_text_color_highlight_v2"
-                            android:textColorHint="@color/c_text_v2"
-                            android:textCursorDrawable="@xml/gx_search_cursor_state"
-                            android:textIsSelectable="false"
-                            android:textSize="16sp"
-                            app:hintAnimationEnabled="false"
-                            tools:targetApi="o">
+                            android:gravity="start"
+                            android:orientation="horizontal"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:ignore="RtlHardcoded,UselessParent">
 
-                        </com.darkweb.genesissearchengine.appManager.homeManager.homeController.editTextManager>
+                            <ImageButton
+                                android:id="@+id/pSearchLogo"
+                                android:layout_width="33dp"
+                                android:layout_height="33dp"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginStart="14dp"
+                                android:background="@xml/gx_ripple_default_round"
+                                android:contentDescription="@string/GENERAL_TODO"
+                                android:onClick="onLockSecure"
+                                android:padding="6dp"
+                                android:scaleType="fitCenter"
+                                android:src="@xml/ic_baseline_lock"
+                                android:translationZ="10dp"
+                                app:tint="@color/c_lock_tint"
+                                tools:ignore="RtlSymmetry" />
 
-                        <ImageButton
-                            android:id="@+id/pVoiceInput"
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginStart="-50dp"
-                            android:layout_marginTop="-1dp"
-                            android:layout_marginEnd="15dp"
-                            android:background="@xml/hx_ripple_default_round"
-                            android:contentDescription="@string/GENERAL_TODO"
-                            android:onClick="onVoiceClick"
-                            android:paddingStart="10dp"
-                            android:paddingEnd="10dp"
-                            android:scaleX="1.1"
-                            android:scaleY="1.1"
-                            android:src="@xml/ic_baseline_keyboard_voice"
-                            android:tint="@color/c_text_v8"
-                            android:visibility="invisible" />
+                            <View
+                                android:id="@+id/pSearchDivider"
+                                android:layout_width="1px"
+                                android:layout_height="20dp"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginLeft="3dp"
+                                android:background="@color/c_home_side"
+                                android:translationZ="1dp"
+                                tools:ignore="RtlSymmetry" />
 
-                        <Button
-                            android:id="@+id/pNewTab"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginTop="-1dp"
-                            android:layout_marginBottom="0dp"
-                            android:background="@xml/gx_generic_tab_button"
-                            android:contentDescription="@string/GENERAL_TODO"
-                            android:scaleType="fitCenter"
-                            android:text="@string/HOME_TAB_TEXT"
-                            android:textColor="@color/c_text_v1"
-                            android:textSize="12.5sp"
-                            android:tint="@color/black" />
+                            <com.darkweb.genesissearchengine.appManager.homeManager.homeController.editTextManager
+                                android:id="@+id/pSearchInput"
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginStart="-41dp"
+                                android:layout_marginTop="8dp"
+                                android:layout_marginEnd="5dp"
+                                android:layout_marginBottom="8dp"
+                                android:layout_weight="1"
+                                android:animateLayoutChanges="true"
+                                android:background="@xml/gx_generic_input"
+                                android:completionHintView="@layout/hint_view"
+                                android:dropDownAnchor="@id/pSearchEngineBar"
+                                android:ems="10"
+                                android:fadingEdgeLength="20dp"
+                                android:focusableInTouchMode="true"
+                                android:focusedByDefault="false"
+                                android:hint="@string/GENERAL_SEARCH_HINT"
+                                android:imeOptions="flagNoExtractUi"
+                                android:importantForAutofill="no"
+                                android:inputType="textNoSuggestions"
+                                android:maxLines="1"
+                                android:paddingStart="52dp"
+                                android:paddingEnd="15dp"
+                                android:paddingBottom="2dp"
+                                android:popupElevation="0dp"
+                                android:requiresFadingEdge="horizontal"
+                                android:selectAllOnFocus="true"
+                                android:text="@string/GENERAL_HOME_URL"
+                                android:textColor="@color/c_text_v1"
+                                android:textColorHighlight="@color/c_text_color_highlight_v2"
+                                android:textColorHint="@color/c_text_v2"
+                                android:textCursorDrawable="@xml/gx_search_cursor_state"
+                                android:textIsSelectable="false"
+                                android:textSize="16sp"
+                                app:hintAnimationEnabled="false"
+                                tools:targetApi="o">
 
-                        <ImageButton
-                            android:id="@+id/pMenu"
-                            android:layout_width="35dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="-3dp"
-                            android:layout_marginEnd="0dp"
-                            android:background="@xml/gx_ripple_gray"
-                            android:contentDescription="@string/GENERAL_TODO"
-                            android:onClick="onOpenMenuItem"
-                            android:paddingStart="8dp"
-                            android:paddingTop="15dp"
-                            android:paddingEnd="8dp"
-                            android:paddingBottom="15dp"
-                            android:scaleType="fitCenter"
-                            android:src="@drawable/menu_item"
-                            android:tint="@color/c_navigation_tint" />
+                            </com.darkweb.genesissearchengine.appManager.homeManager.homeController.editTextManager>
+
+                            <ImageButton
+                                android:id="@+id/pVoiceInput"
+                                android:layout_width="36dp"
+                                android:layout_height="36dp"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginStart="-50dp"
+                                android:layout_marginTop="-1dp"
+                                android:layout_marginEnd="15dp"
+                                android:background="@xml/hx_ripple_default_round"
+                                android:contentDescription="@string/GENERAL_TODO"
+                                android:onClick="onVoiceClick"
+                                android:paddingStart="10dp"
+                                android:paddingEnd="10dp"
+                                android:scaleX="1.1"
+                                android:scaleY="1.1"
+                                android:src="@xml/ic_baseline_keyboard_voice"
+                                android:visibility="invisible"
+                                app:tint="@color/c_text_v8" />
+
+                            <Button
+                                android:id="@+id/pNewTab"
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginTop="-1dp"
+                                android:layout_marginBottom="0dp"
+                                android:background="@xml/gx_generic_tab_button"
+                                android:contentDescription="@string/GENERAL_TODO"
+                                android:scaleType="fitCenter"
+                                android:text="@string/HOME_TAB_TEXT"
+                                android:textColor="@color/c_text_v1"
+                                android:textSize="12.5sp"
+                                android:tint="@color/black" />
+
+                            <ImageButton
+                                android:id="@+id/pMenu"
+                                android:layout_width="35dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="-3dp"
+                                android:layout_marginEnd="0dp"
+                                android:background="@xml/gx_ripple_gray"
+                                android:contentDescription="@string/GENERAL_TODO"
+                                android:onClick="onOpenMenuItem"
+                                android:paddingStart="8dp"
+                                android:paddingTop="15dp"
+                                android:paddingEnd="8dp"
+                                android:paddingBottom="15dp"
+                                android:scaleType="fitCenter"
+                                android:src="@drawable/menu_item"
+                                app:tint="@color/c_navigation_tint" />
+
+                        </LinearLayout>
 
                     </LinearLayout>
 
-                </LinearLayout>
+                    <ImageView
+                        android:id="@+id/pTopBarHider"
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp"
+                        android:alpha="0"
+                        android:background="@color/c_background"
+                        android:clickable="false"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:focusable="false"
+                        android:translationZ="4dp"
+                        android:visibility="gone"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-                <ImageView
-                    android:id="@+id/pTopBarHider"
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:alpha="0"
-                    android:background="@color/c_background"
-                    android:clickable="false"
-                    android:contentDescription="@string/GENERAL_TODO"
-                    android:focusable="false"
-                    android:translationZ="4dp"
-                    android:visibility="gone"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <!-- Live Build -->
-                <com.mopub.mobileads.MoPubView
-                    android:id="@+id/pAdView"
-                    android:layout_width='320dp'
-                    android:layout_height='50dp'
-                    android:alpha="0"
-                    android:background="@color/c_border_background_divider"
-                    android:visibility="gone"
-                    app:moPubAdSize='match_view'
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/pTopbar" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
 
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -242,11 +241,11 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/pWebLayoutView"
-                android:paddingBottom="60dp"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginBottom="0dp"
                 android:background="@color/c_background"
+                android:paddingBottom="60dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/pTopLayout">
@@ -256,6 +255,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:alpha="1"
+                    android:visibility="gone"
                     android:background="@color/c_background"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -736,10 +736,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="18dp"
                 android:layout_marginBottom="20dp"
+                android:alpha="0"
                 android:background="@xml/hx_border_left"
                 android:ellipsize="end"
                 android:gravity="start"
-                android:alpha="0"
                 android:maxHeight="250dp"
                 android:maxLines="4"
                 android:minHeight="80dp"
@@ -769,7 +769,7 @@
                 app:srcCompat="@drawable/icon_loading" />
 
             <ImageView
-                android:id="@+id/pBlocker"
+                android:id="@+id/pSecureRootBlocker"
                 android:layout_width="189dp"
                 android:layout_height="65dp"
                 android:layout_marginTop="14dp"
@@ -787,7 +787,7 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
-    
+
     <include
         android:id="@+id/pFindBar"
         layout="@layout/popup_find"
@@ -797,7 +797,7 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/adView" />
 
     <include
         android:id="@+id/pSearchEngineBar"
@@ -808,7 +808,8 @@
         android:elevation="8dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/adView" />
 
     <ImageView
         android:id="@+id/pBlockerFullSceen"
@@ -844,7 +845,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toEndOf="@+id/pCoordinatorLayout"
+        app:layout_constraintTop_toTopOf="@+id/pSplashLayout" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/home/layout/popup_side_menu.xml b/app/src/main/res/layouts/home/layout/popup_side_menu.xml
index c8afc5ca..3061064a 100644
--- a/app/src/main/res/layouts/home/layout/popup_side_menu.xml
+++ b/app/src/main/res/layouts/home/layout/popup_side_menu.xml
@@ -8,6 +8,7 @@
         android:layout_height="wrap_content">
 
     <ScrollView
+        android:id="@+id/pScrollView"
         android:textDirection="locale"
         android:textAlignment="viewStart"
         android:layout_width="260dp"
diff --git a/app/src/main/res/layouts/landing/layout/landing_view.xml b/app/src/main/res/layouts/landing/layout/landing_view.xml
deleted file mode 100644
index 7660bdd3..00000000
--- a/app/src/main/res/layouts/landing/layout/landing_view.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:background="@color/c_landing_page_background"
-        >
-
-    <TextView
-            android:translationY="-50dp"
-            android:id="@+id/pHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text=""
-            android:textColor="@color/c_white"
-            android:gravity="center"
-            android:layout_margin="12dp"
-            android:textStyle="bold"
-            android:textSize="28sp"/>
-    <TextView
-            android:translationY="-50dp"
-            android:id="@+id/pSubHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text=""
-            android:textColor="@color/c_white"
-            android:gravity="center"
-            android:layout_margin="12dp"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:visibility="gone"
-            />
-
-    <Button
-            android:translationY="-50dp"
-            android:id="@+id/pNextButton"
-            android:layout_width="120dp"
-            android:layout_height="40dp"
-            android:layout_margin="10dp"
-            android:padding="10dp"
-            android:background="@xml/lx_round_drawable"
-            android:textColor="@color/c_white"
-            android:visibility="gone"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/language/layout/lang_row_view.xml b/app/src/main/res/layouts/language/layout/lang_row_view.xml
index 44bfb4e0..55807891 100644
--- a/app/src/main/res/layouts/language/layout/lang_row_view.xml
+++ b/app/src/main/res/layouts/language/layout/lang_row_view.xml
@@ -33,7 +33,7 @@
             android:orientation="vertical">
 
             <TextView
-                android:id="@+id/pHeader"
+                android:id="@+id/pOrbotRowHeader"
                 android:layout_marginTop="10dp"
                 android:textSize="15.5sp"
                 android:paddingStart="7dp"
@@ -46,7 +46,7 @@
                 android:text="@string/GENERAL_TODO" />
 
             <TextView
-                android:id="@+id/pDescription"
+                android:id="@+id/pOrbotRowDescription"
                 android:textSize="12sp"
                 android:paddingStart="7dp"
                 android:paddingEnd="7dp"
diff --git a/app/src/main/res/layouts/language/layout/language_view.xml b/app/src/main/res/layouts/language/layout/language_view.xml
index 93165c5d..ce8752a1 100644
--- a/app/src/main/res/layouts/language/layout/language_view.xml
+++ b/app/src/main/res/layouts/language/layout/language_view.xml
@@ -31,16 +31,16 @@
             android:layout_marginTop="1dp"
             android:background="@xml/gx_ripple_default_round"
             android:contentDescription="@string/GENERAL_TODO"
-            android:onClick="onCloseTrigger"
+            android:onClick="onClose"
             android:src="@xml/ic_arrow_back"
-            android:tint="@color/c_navigation_tint" />
+            app:tint="@color/c_navigation_tint" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginTop="-3dp"
             android:gravity="center_vertical|start"
-            android:onClick="onCloseTrigger"
+            android:onClick="onClose"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
             android:text="@string/LANGUAGE_TITLE"
@@ -80,7 +80,7 @@
     </androidx.recyclerview.widget.RecyclerView>
 
     <ImageView
-        android:id="@+id/pBlocker"
+        android:id="@+id/pSecureRootBlocker"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="48dp"
diff --git a/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml b/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
index caa54279..976bb9fb 100644
--- a/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
+++ b/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
@@ -25,16 +25,16 @@
                 <ImageButton
                     android:layout_width="45dp"
                     android:layout_height="45dp"
-                    android:onClick="onCloseTrigger"
+                    android:onClick="onClose"
                     android:layout_marginTop="3dp"
                     android:layout_marginStart="3dp"
-                    android:tint="@color/c_navigation_tint"
                     android:src="@xml/ic_arrow_back"
                     android:background="@xml/gx_ripple_default_round"
-                    android:contentDescription="@string/GENERAL_TODO"/>
+                    android:contentDescription="@string/GENERAL_TODO"
+                    app:tint="@color/c_navigation_tint" />
                 <TextView
                         android:textColor="@color/c_text_v1"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:textSize="17sp"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
diff --git a/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml b/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml
index de6cf687..55786e7b 100644
--- a/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml
+++ b/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml
@@ -6,7 +6,7 @@
         android:background="@color/c_background">
 
     <LinearLayout
-        android:id="@+id/linearLayout2"
+        android:id="@+id/pOrbotLogToolbar"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="@color/c_background"
@@ -21,28 +21,32 @@
         tools:ignore="RtlSymmetry">
 
         <ImageButton
+            android:id="@+id/pOrbotLogBack"
             android:layout_width="45dp"
             android:layout_height="45dp"
             android:layout_marginStart="0dp"
             android:layout_marginTop="1dp"
             android:background="@xml/gx_ripple_default_round"
             android:contentDescription="@string/GENERAL_TODO"
-            android:onClick="onCloseTrigger"
+            android:onClick="onCloseTriggered"
             android:src="@xml/ic_arrow_back"
-            android:tint="@color/c_navigation_tint" />
+            app:tint="@color/c_navigation_tint"
+            tools:ignore="UsingOnClickInXml" />
 
         <TextView
+            android:id="@+id/pOrbotLogToolbarHeader"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginTop="-3dp"
             android:gravity="center_vertical|start"
-            android:onClick="onCloseTrigger"
+            android:onClick="onCloseTriggered"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
             android:text="@string/ORBOT_LOG"
             android:textColor="@color/c_text_v1"
             android:textSize="17sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:ignore="UsingOnClickInXml" />
 
         <View
             android:layout_width="0dp"
@@ -50,6 +54,7 @@
             android:layout_weight="1" />
 
         <ImageButton
+            android:id="@+id/pOrbotLogSettings"
             android:layout_width="45dp"
             android:layout_height="45dp"
             android:layout_marginStart="0dp"
@@ -57,21 +62,22 @@
             android:layout_marginTop="1dp"
             android:background="@xml/gx_ripple_default_round"
             android:contentDescription="@string/GENERAL_TODO"
-            android:onClick="onOpenInfo"
+            android:onClick="onUITriggered"
             android:src="@xml/ic_gear"
-            app:tint="@color/c_header_icon_tint" />
+            app:tint="@color/c_header_icon_tint"
+            tools:ignore="UsingOnClickInXml" />
 
     </LinearLayout>
 
     <androidx.core.widget.NestedScrollView
-        android:id="@+id/pNestedScrollView"
+        android:id="@+id/pOrbotLogNestedScroll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fillViewport="true"
         android:paddingBottom="10dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
+        app:layout_constraintTop_toBottomOf="@+id/pOrbotLogToolbar">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -89,12 +95,13 @@
                 android:orientation="horizontal">
 
                 <TextView
+                    android:id="@+id/pOrbotLogHeaderText"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:paddingEnd="15dp"
-                    android:paddingStart="15dp"
                     android:layout_marginTop="10dp"
                     android:layout_weight="40"
+                    android:paddingStart="15dp"
+                    android:paddingEnd="15dp"
                     android:text="@string/ORBOT_LOG_HEADER"
                     android:textColor="@color/c_text_short_header"
                     android:textSize="16sp"
@@ -110,6 +117,7 @@
                 android:orientation="horizontal">
 
                 <TextView
+                    android:id="@+id/pOrbotLogDescription"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="15dp"
@@ -122,10 +130,10 @@
             </LinearLayout>
 
             <TextView
-                android:id="@+id/pLogs"
+                android:id="@+id/pOrbotLogLoadingText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@xml/sx_border_left"
+                android:background="@xml/olx_border_left"
                 android:layout_marginStart="10dp"
                 android:paddingStart="15dp"
                 android:paddingEnd="15dp"
@@ -136,11 +144,11 @@
                 android:textColor="@color/c_text_v4"
                 android:textSize="14sp"
                 android:visibility="gone"
-                android:text="@string/HOME_LOADING_STATIC"
+                android:text="@string/ORBOT_LOADING_STATIC"
                 tools:ignore="RtlSymmetry" />
 
             <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/pLogRecycleView"
+                android:id="@+id/pOrbotLogRecycleView"
                 android:fillViewport="true"
                 android:paddingBottom="150dp"
                 android:layout_width="match_parent"
@@ -151,20 +159,21 @@
     </androidx.core.widget.NestedScrollView>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/pFloatingScroller"
+        android:id="@+id/pOrbotLogFloatingToolbar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:alpha="0"
         android:visibility="gone"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:onClick="onScrollBottomAnimated"
+        android:onClick="onUITriggered"
         android:clickable="true"
         android:tint="@color/c_white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:srcCompat="@xml/ic_baseline_keyboard_arrow_down"
         android:focusable="true"
-        android:contentDescription="@string/GENERAL_TODO" />
+        android:contentDescription="@string/GENERAL_TODO"
+        tools:ignore="UsingOnClickInXml" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layouts/orbotLog/layout/orbot_row_view.xml b/app/src/main/res/layouts/orbotLog/layout/orbot_row_view.xml
index 5e8fd8d8..49b375ac 100644
--- a/app/src/main/res/layouts/orbotLog/layout/orbot_row_view.xml
+++ b/app/src/main/res/layouts/orbotLog/layout/orbot_row_view.xml
@@ -1,20 +1,18 @@
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/pRowContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
     android:layout_marginStart="10dp"
-    android:paddingStart="5dp"
+    android:layout_marginTop="8dp"
     android:background="@xml/sx_border_left"
     android:orientation="horizontal"
+    android:paddingStart="5dp"
     android:weightSum="10"
     tools:ignore="RtlSymmetry">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pRowContainerInner"
+        android:id="@+id/pOrbotRowContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@xml/gx_ripple_gray"
@@ -39,22 +37,23 @@
             android:paddingEnd="8dp"
             android:paddingBottom="10dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/pRemoveRow"
+            app:layout_constraintEnd_toStartOf="@+id/pOrbotRowRemove"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="NestedWeights,RtlSymmetry">
 
             <TextView
-                android:id="@+id/pHeader"
+                android:id="@+id/pOrbotRowHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="15dp"
                 android:clickable="false"
-                android:text="test header"
+                android:text="@string/GENERAL_TODO"
                 android:textColor="@color/c_text_v1"
                 android:textSize="14.5sp" />
 
             <LinearLayout
+                android:id="@+id/pOrbotRowFooter"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="15dp"
@@ -67,6 +66,7 @@
                 tools:layout_editor_absoluteX="114dp">
 
                 <ImageView
+                    android:id="@+id/pOrbotRowClock"
                     android:layout_width="wrap_content"
                     android:layout_height="18dp"
                     android:layout_marginStart="-5dp"
@@ -79,14 +79,14 @@
                     app:tint="@color/c_divider_line_light" />
 
                 <TextView
-                    android:id="@+id/pDescription"
+                    android:id="@+id/pOrbotRowDescription"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="3dp"
                     android:layout_marginTop="0dp"
                     android:clickable="false"
                     android:ellipsize="end"
-                    android:text="test description"
+                    android:text="@string/GENERAL_TODO"
                     android:textColor="@color/c_text_v3"
                     android:textSize="13sp" />
 
@@ -95,7 +95,7 @@
         </LinearLayout>
 
         <ImageButton
-            android:id="@+id/pRemoveRow"
+            android:id="@+id/pOrbotRowRemove"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginEnd="15dp"
@@ -104,11 +104,11 @@
             android:longClickable="true"
             android:scaleType="fitCenter"
             android:src="@xml/ic_baseline_keyboard_arrow_right"
-            android:tint="@color/c_text_v3"
             android:translationZ="10dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/c_text_v3"
             tools:ignore="RtlSymmetry" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layouts/proxyStatus/layout/proxy_status_view.xml b/app/src/main/res/layouts/proxyStatus/layout/proxy_status_view.xml
index 516ddd3b..7eddf24c 100644
--- a/app/src/main/res/layouts/proxyStatus/layout/proxy_status_view.xml
+++ b/app/src/main/res/layouts/proxyStatus/layout/proxy_status_view.xml
@@ -26,16 +26,16 @@
                 <ImageButton
                     android:layout_width="45dp"
                     android:layout_height="45dp"
-                    android:onClick="onCloseTrigger"
+                    android:onClick="onClose"
                     android:layout_marginTop="3dp"
                     android:layout_marginStart="3dp"
-                    android:tint="@color/c_navigation_tint"
                     android:src="@xml/ic_arrow_back"
                     android:background="@xml/gx_ripple_default_round"
-                    android:contentDescription="@string/GENERAL_TODO"/>
+                    android:contentDescription="@string/GENERAL_TODO"
+                    app:tint="@color/c_navigation_tint" />
                 <TextView
                         android:textColor="@color/c_text_v1"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:textSize="17sp"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
diff --git a/app/src/main/res/layouts/searchWidget/layout/widget_search_controller.xml b/app/src/main/res/layouts/searchWidget/layout/widget_search_controller.xml
index 47bdfa69..f269a92c 100644
--- a/app/src/main/res/layouts/searchWidget/layout/widget_search_controller.xml
+++ b/app/src/main/res/layouts/searchWidget/layout/widget_search_controller.xml
@@ -76,8 +76,8 @@
             android:scaleX="1.1"
             android:scaleY="1.1"
             android:src="@xml/ic_baseline_keyboard_voice"
-            android:tint="@color/c_navigation_tint"
-            android:visibility="visible" />
+            android:visibility="visible"
+            app:tint="@color/c_navigation_tint" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layouts/setting/layout/setting.xml b/app/src/main/res/layouts/setting/layout/setting.xml
index b32eaf3d..95464622 100644
--- a/app/src/main/res/layouts/setting/layout/setting.xml
+++ b/app/src/main/res/layouts/setting/layout/setting.xml
@@ -39,7 +39,7 @@
                         android:contentDescription="@string/GENERAL_TODO"
                         android:onClick="onNavigationBackPressed"
                         android:src="@xml/ic_arrow_back"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -90,7 +90,7 @@
                         android:padding="10dp"
                         android:layout_marginStart="5dp"
                         android:layout_marginEnd="5dp"
-                        app:tint="@color/c_icon_tint"
+                        app:tint="@color/c_setting_icon_tint"
                         android:src="@xml/ic_baseline_browser"
                         android:contentDescription="@string/GENERAL_TODO" />
 
@@ -132,7 +132,7 @@
                         android:padding="10dp"
                         android:layout_marginStart="5dp"
                         android:layout_marginEnd="5dp"
-                        app:tint="@color/c_icon_tint"
+                        app:tint="@color/c_setting_icon_tint"
                         android:src="@xml/ic_baseline_home"
                         android:contentDescription="@string/GENERAL_TODO" />
 
@@ -181,8 +181,8 @@
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:tint="@color/c_navigation_tint"
-                        android:src="@xml/ic_arrow_right"/>
+                        android:src="@xml/ic_arrow_right"
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -208,7 +208,7 @@
                         android:padding="10dp"
                         android:layout_marginStart="5dp"
                         android:layout_marginEnd="5dp"
-                        app:tint="@color/c_icon_tint"
+                        app:tint="@color/c_setting_icon_tint"
                         android:src="@xml/ic_baseline_search"
                         android:contentDescription="@string/GENERAL_TODO" />
 
@@ -256,8 +256,8 @@
                         android:contentDescription="@string/GENERAL_TODO"
                         android:clickable="false"
                         android:layout_marginEnd="5dp"
-                        android:tint="@color/c_navigation_tint"
-                        android:src="@xml/ic_arrow_right" />
+                        android:src="@xml/ic_arrow_right"
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -281,7 +281,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:padding="10dp"
-                        app:tint="@color/c_icon_tint"
+                        app:tint="@color/c_setting_icon_tint"
                         android:layout_marginStart="5dp"
                         android:layout_marginEnd="5dp"
                         android:src="@xml/ic_baseline_privacy"
@@ -331,8 +331,8 @@
                         android:contentDescription="@string/GENERAL_TODO"
                         android:clickable="false"
                         android:layout_marginEnd="5dp"
-                        android:tint="@color/c_navigation_tint"
-                        android:src="@xml/ic_arrow_right" />
+                        android:src="@xml/ic_arrow_right"
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -351,7 +351,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:padding="10dp"
-                        app:tint="@color/c_icon_tint"
+                        app:tint="@color/c_setting_icon_tint"
                         android:layout_marginStart="5dp"
                         android:layout_marginEnd="5dp"
                         android:src="@xml/ic_baseline_remove_red_eye"
@@ -401,8 +401,8 @@
                         android:contentDescription="@string/GENERAL_TODO"
                         android:clickable="false"
                         android:layout_marginEnd="5dp"
-                        android:tint="@color/c_navigation_tint"
-                        android:src="@xml/ic_arrow_right" />
+                        android:src="@xml/ic_arrow_right"
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -425,7 +425,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        app:tint="@color/c_icon_tint"
+                        app:tint="@color/c_setting_icon_tint"
                         android:padding="10dp"
                         android:layout_marginStart="5dp"
                         android:layout_marginEnd="5dp"
@@ -473,9 +473,9 @@
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:layout_marginEnd="5dp"
-                        android:tint="@color/c_navigation_tint"
                         android:src="@xml/ic_arrow_right"
-                        android:contentDescription="@string/GENERAL_TODO" />
+                        android:contentDescription="@string/GENERAL_TODO"
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -501,7 +501,7 @@
                         android:padding="10dp"
                         android:layout_marginStart="5dp"
                         android:layout_marginEnd="5dp"
-                        app:tint="@color/c_icon_tint"
+                        app:tint="@color/c_setting_icon_tint"
                         android:src="@xml/ic_baseline_accessibility"
                         android:contentDescription="@string/GENERAL_TODO" />
 
@@ -547,9 +547,9 @@
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:layout_marginEnd="5dp"
-                        android:tint="@color/c_navigation_tint"
                         android:src="@xml/ic_arrow_right"
-                        android:contentDescription="@string/GENERAL_TODO" />
+                        android:contentDescription="@string/GENERAL_TODO"
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -573,7 +573,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:padding="10dp"
-                        app:tint="@color/c_icon_tint"
+                        app:tint="@color/c_setting_icon_tint"
                         android:layout_marginStart="5dp"
                         android:layout_marginEnd="5dp"
                         android:src="@xml/ic_baseline_clear"
@@ -621,9 +621,9 @@
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:layout_marginEnd="5dp"
-                        android:tint="@color/c_navigation_tint"
                         android:src="@xml/ic_arrow_right"
-                        android:contentDescription="@string/GENERAL_TODO" />
+                        android:contentDescription="@string/GENERAL_TODO"
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -644,7 +644,7 @@
 
                     <ImageView
                         android:layout_width="wrap_content"
-                        app:tint="@color/c_icon_tint"
+                        app:tint="@color/c_setting_icon_tint"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:padding="10dp"
@@ -695,9 +695,9 @@
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:layout_marginEnd="5dp"
-                        android:tint="@color/c_navigation_tint"
                         android:src="@xml/ic_arrow_right"
-                        android:contentDescription="@string/GENERAL_TODO" />
+                        android:contentDescription="@string/GENERAL_TODO"
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -726,7 +726,7 @@
                         android:contentDescription="@string/GENERAL_TODO"
                         android:padding="10dp"
                         android:src="@xml/ic_baseline_vpn"
-                        app:tint="@color/c_icon_tint" />
+                        app:tint="@color/c_setting_icon_tint" />
 
                     <LinearLayout
                         android:layout_width="0dp"
@@ -773,7 +773,7 @@
                         android:clickable="false"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_arrow_right"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -802,7 +802,7 @@
                         android:contentDescription="@string/GENERAL_TODO"
                         android:padding="10dp"
                         android:src="@xml/ic_baseline_rate"
-                        app:tint="@color/c_icon_tint" />
+                        app:tint="@color/c_setting_icon_tint" />
 
                     <LinearLayout
                         android:layout_width="0dp"
@@ -849,7 +849,7 @@
                         android:clickable="false"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_arrow_right"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -872,7 +872,7 @@
                         android:contentDescription="@string/GENERAL_TODO"
                         android:padding="10dp"
                         android:src="@xml/ic_baseline_share"
-                        app:tint="@color/c_icon_tint" />
+                        app:tint="@color/c_setting_icon_tint" />
 
                     <LinearLayout
                         android:layout_width="0dp"
@@ -919,7 +919,7 @@
                         android:clickable="false"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_arrow_right"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -949,7 +949,7 @@
                         android:contentDescription="@string/GENERAL_TODO"
                         android:padding="10dp"
                         android:src="@xml/ic_baseline_policy"
-                        app:tint="@color/c_icon_tint" />
+                        app:tint="@color/c_setting_icon_tint" />
 
                     <LinearLayout
                         android:layout_width="0dp"
@@ -996,7 +996,7 @@
                         android:clickable="false"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_arrow_right"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -1019,7 +1019,7 @@
                         android:contentDescription="@string/GENERAL_TODO"
                         android:padding="10dp"
                         android:src="@xml/ic_baseline_report"
-                        app:tint="@color/c_icon_tint" />
+                        app:tint="@color/c_setting_icon_tint" />
 
                     <LinearLayout
                         android:layout_width="0dp"
@@ -1066,7 +1066,7 @@
                         android:clickable="false"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_arrow_right"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -1089,7 +1089,7 @@
                         android:contentDescription="@string/GENERAL_TODO"
                         android:padding="10dp"
                         android:src="@xml/ic_baseline_sitemap"
-                        app:tint="@color/c_icon_tint" />
+                        app:tint="@color/c_setting_icon_tint" />
 
                     <LinearLayout
                         android:layout_width="0dp"
@@ -1136,7 +1136,7 @@
                         android:clickable="false"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_arrow_right"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
@@ -1167,7 +1167,7 @@
                         android:contentDescription="@string/GENERAL_TODO"
                         android:padding="10dp"
                         android:src="@xml/ic_baseline_fingerprint"
-                        app:tint="@color/c_icon_tint" />
+                        app:tint="@color/c_setting_icon_tint" />
 
                     <LinearLayout
                         android:layout_width="0dp"
@@ -1214,7 +1214,7 @@
                         android:clickable="false"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_arrow_right"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml b/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml
index 0f55ac15..2171d68f 100644
--- a/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml
@@ -36,9 +36,9 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:src="@xml/ic_arrow_back"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -46,7 +46,7 @@
                         android:layout_marginTop="-3dp"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_ACCESSIBILITY_HEADER"
                         android:textColor="@color/c_text_v1"
diff --git a/app/src/main/res/layouts/setting/layout/setting_advance_view.xml b/app/src/main/res/layouts/setting/layout/setting_advance_view.xml
index 3906e6d4..5172420c 100644
--- a/app/src/main/res/layouts/setting/layout/setting_advance_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_advance_view.xml
@@ -36,16 +36,16 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:src="@xml/ic_arrow_back"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
                         android:text="@string/SETTING_ADVANCE_HEADER"
diff --git a/app/src/main/res/layouts/setting/layout/setting_clear_view.xml b/app/src/main/res/layouts/setting/layout/setting_clear_view.xml
index 5e872261..6229e8cd 100644
--- a/app/src/main/res/layouts/setting/layout/setting_clear_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_clear_view.xml
@@ -37,9 +37,9 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:src="@xml/ic_arrow_back"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -47,7 +47,7 @@
                         android:layout_marginTop="-3dp"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_CLEAR_HEADER"
                         android:textColor="@color/c_text_v1"
diff --git a/app/src/main/res/layouts/setting/layout/setting_general_view.xml b/app/src/main/res/layouts/setting/layout/setting_general_view.xml
index 36fd2277..1ae55e9e 100644
--- a/app/src/main/res/layouts/setting/layout/setting_general_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_general_view.xml
@@ -35,16 +35,16 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:src="@xml/ic_arrow_back"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_GENERAL_HEADER"
@@ -523,7 +523,7 @@
                     <com.google.android.material.switchmaterial.SwitchMaterial
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:id="@+id/pJSStatus"
+                        android:id="@+id/pSecureJavascriptStatus"
                         android:clickable="false"
                         android:focusable="false"
                         android:layout_marginEnd="10dp"
@@ -586,9 +586,9 @@
                         android:layout_width="50dp"
                         android:layout_height="match_parent"
                         android:background="@android:color/transparent"
-                        android:tint="@color/c_navigation_tint"
                         android:src="@xml/ic_arrow_right"
-                        android:contentDescription="@string/GENERAL_TODO" />
+                        android:contentDescription="@string/GENERAL_TODO"
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layouts/setting/layout/setting_log_view.xml b/app/src/main/res/layouts/setting/layout/setting_log_view.xml
index 843302df..c7e7d592 100644
--- a/app/src/main/res/layouts/setting/layout/setting_log_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_log_view.xml
@@ -34,16 +34,16 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:src="@xml/ic_arrow_back"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_ORBOT_LOG_HEADER"
diff --git a/app/src/main/res/layouts/setting/layout/setting_notification_view.xml b/app/src/main/res/layouts/setting/layout/setting_notification_view.xml
index bd1526c0..09ad0a9e 100644
--- a/app/src/main/res/layouts/setting/layout/setting_notification_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_notification_view.xml
@@ -35,16 +35,16 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:src="@xml/ic_arrow_back"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_NOTIFICATION_HEADER"
@@ -232,9 +232,9 @@
                         android:clickable="false"
                         android:focusable="false"
                         android:background="@android:color/transparent"
-                        android:tint="@color/c_navigation_tint"
                         android:src="@xml/ic_arrow_right"
-                        android:contentDescription="@string/GENERAL_TODO" />
+                        android:contentDescription="@string/GENERAL_TODO"
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml b/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml
index b4f8be80..656cc26e 100644
--- a/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml
@@ -35,16 +35,16 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:src="@xml/ic_arrow_back"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_PRIVACY_HEADER"
@@ -168,7 +168,7 @@
                         android:clickable="false"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_arrow_right"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layouts/setting/layout/setting_search_view.xml b/app/src/main/res/layouts/setting/layout/setting_search_view.xml
index be99f7c9..df5d8832 100644
--- a/app/src/main/res/layouts/setting/layout/setting_search_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_search_view.xml
@@ -36,17 +36,16 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:src="@xml/ic_arrow_back"
-                        android:tint="@color/c_navigation_tint"
-                        />
+                        app:tint="@color/c_navigation_tint" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_SEARCH_HEADER"
diff --git a/app/src/main/res/layouts/setting/layout/setting_tracking_view.xml b/app/src/main/res/layouts/setting/layout/setting_tracking_view.xml
index ab1cc934..d4bd1028 100644
--- a/app/src/main/res/layouts/setting/layout/setting_tracking_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_tracking_view.xml
@@ -35,16 +35,16 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:src="@xml/ic_arrow_back"
-                        android:tint="@color/c_navigation_tint" />
+                        app:tint="@color/c_navigation_tint" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onCloseTrigger"
+                        android:onClick="onClose"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_TRACKING_HEADER"
diff --git a/app/src/main/res/layouts/shared/listviews/layout/history_bookmark_row_view.xml b/app/src/main/res/layouts/shared/listviews/layout/history_bookmark_row_view.xml
index beccaa57..54bd3956 100644
--- a/app/src/main/res/layouts/shared/listviews/layout/history_bookmark_row_view.xml
+++ b/app/src/main/res/layouts/shared/listviews/layout/history_bookmark_row_view.xml
@@ -87,7 +87,7 @@
                 tools:ignore="NestedWeights,RtlSymmetry">
 
                 <TextView
-                    android:id="@+id/pHeader"
+                    android:id="@+id/pOrbotRowHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/c_text_v1"
@@ -99,7 +99,7 @@
 
                 <TextView
                     android:layout_marginStart="10dp"
-                    android:id="@+id/pDescription"
+                    android:id="@+id/pOrbotRowDescription"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
diff --git a/app/src/main/res/layouts/tab/layout/tab_grid_view.xml b/app/src/main/res/layouts/tab/layout/tab_grid_view.xml
index 3ccf0b13..ed1abb5c 100644
--- a/app/src/main/res/layouts/tab/layout/tab_grid_view.xml
+++ b/app/src/main/res/layouts/tab/layout/tab_grid_view.xml
@@ -30,7 +30,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.cardview.widget.CardView
-            android:id="@+id/pRowContainerInner"
+            android:id="@+id/pTABRowContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clickable="true"
@@ -120,13 +120,13 @@
                 android:orientation="vertical"
                 android:paddingEnd="8dp"
                 android:visibility="visible"
-                app:layout_constraintEnd_toStartOf="@+id/pRemoveRow"
+                app:layout_constraintEnd_toStartOf="@+id/pOrbotRowRemove"
                 app:layout_constraintStart_toEndOf="@+id/cardView"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:ignore="NestedWeights,RtlSymmetry">
 
                 <TextView
-                    android:id="@+id/pDescription"
+                    android:id="@+id/pOrbotRowDescription"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="0dp"
@@ -142,7 +142,7 @@
                     android:textSize="13sp" />
 
                 <TextView
-                    android:id="@+id/pHeader"
+                    android:id="@+id/pOrbotRowHeader"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="0dp"
@@ -216,7 +216,7 @@
                 android:visibility="visible" />
 
             <ImageButton
-                android:id="@+id/pRemoveRow"
+                android:id="@+id/pOrbotRowRemove"
                 android:layout_width="39dp"
                 android:layout_height="39dp"
                 android:background="@xml/tx_ripple_light"
diff --git a/app/src/main/res/layouts/tab/layout/tab_row_view.xml b/app/src/main/res/layouts/tab/layout/tab_row_view.xml
index 4d7a6c1a..58d0e6c6 100644
--- a/app/src/main/res/layouts/tab/layout/tab_row_view.xml
+++ b/app/src/main/res/layouts/tab/layout/tab_row_view.xml
@@ -15,7 +15,7 @@
     tools:ignore="RtlSymmetry">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pRowContainerInner"
+        android:id="@+id/pTabRowContainer"
         android:layout_width="match_parent"
         android:layout_height="90dp"
         android:clickable="true"
@@ -96,13 +96,13 @@
             android:focusable="false"
             android:orientation="vertical"
             android:paddingEnd="8dp"
-            app:layout_constraintEnd_toStartOf="@+id/pRemoveRow"
+            app:layout_constraintEnd_toStartOf="@+id/pOrbotRowRemove"
             app:layout_constraintStart_toEndOf="@+id/cardView"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="NestedWeights,RtlSymmetry">
 
             <TextView
-                android:id="@+id/pHeader"
+                android:id="@+id/pOrbotRowHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="0dp"
@@ -115,7 +115,7 @@
                 android:textSize="14.5sp" />
 
             <TextView
-                android:id="@+id/pDescription"
+                android:id="@+id/pOrbotRowDescription"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="0dp"
@@ -180,13 +180,13 @@
             android:longClickable="true"
             android:translationZ="10dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@+id/pRemoveRow"
+            app:layout_constraintEnd_toEndOf="@+id/pOrbotRowRemove"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageButton
-            android:id="@+id/pRemoveRow"
+            android:id="@+id/pOrbotRowRemove"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="2"
@@ -198,11 +198,11 @@
             android:paddingBottom="22dp"
             android:scaleType="fitCenter"
             android:src="@xml/ic_baseline_cross"
-            android:tint="@color/c_navigation_tint"
             android:translationZ="10dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="RtlSymmetry" />
+            tools:ignore="RtlSymmetry"
+            app:tint="@color/c_navigation_tint" />
 
         <ImageView
             android:id="@+id/pBorder"
diff --git a/app/src/main/res/layouts/tab/layout/tab_view.xml b/app/src/main/res/layouts/tab/layout/tab_view.xml
index be39b1f0..74751095 100644
--- a/app/src/main/res/layouts/tab/layout/tab_view.xml
+++ b/app/src/main/res/layouts/tab/layout/tab_view.xml
@@ -47,7 +47,7 @@
                 android:contentDescription="@string/GENERAL_TODO"
                 android:onClick="onMenuTrigger"
                 android:src="@xml/ic_baseline_add"
-                android:tint="@color/c_navigation_tint" />
+                app:tint="@color/c_navigation_tint" />
 
             <TextView
                 android:id="@+id/pSelectionCount"
@@ -101,7 +101,7 @@
                 android:paddingBottom="15dp"
                 android:scaleType="fitCenter"
                 android:src="@drawable/menu_item"
-                android:tint="@color/c_navigation_tint" />
+                app:tint="@color/c_navigation_tint" />
 
             <ImageButton
                 android:id="@+id/pRemoveSelection"
@@ -115,8 +115,8 @@
                 android:contentDescription="@string/GENERAL_TODO"
                 android:onClick="onRemoveSelection"
                 android:src="@xml/ic_baseline_delete"
-                android:tint="@color/c_navigation_tint"
-                android:visibility="gone" />
+                android:visibility="gone"
+                app:tint="@color/c_navigation_tint" />
 
             <ImageButton
                 android:id="@+id/pClearSelection"
@@ -130,8 +130,8 @@
                 android:layout_gravity="center_vertical"
                 android:onClick="onClearSelection"
                 android:src="@xml/ic_refresh"
-                android:tint="@color/c_navigation_tint"
-                android:visibility="gone" />
+                android:visibility="gone"
+                app:tint="@color/c_navigation_tint" />
 
         </LinearLayout>
 
@@ -221,7 +221,7 @@
         android:visibility="gone" />
 
     <ImageView
-        android:id="@+id/pBlocker"
+        android:id="@+id/pSecureRootBlocker"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/clear_alpha"
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index b1b666f3..0a8d8f2e 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,5 +1,27 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">cerqueu alguna cosa o escriviu un enllaç web</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">trobar a la pàgina</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">motor de cerca</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! alguna cosa ha fallat</string>
+	<string name="GENERAL_TODO" translatable="true">tot</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">llibertat digital</string>
+	<string name="GENERAL_RELOAD" translatable="true">recarregar</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">us trobeu amb el problema següent. pot ser que la pàgina web o el lloc web no funcionin. és possible que la vostra connexió a Internet sigui deficient. és possible que utilitzeu un servidor intermediari. el tallafoc podria bloquejar el lloc web</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC, Israel torna a atacar</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Esborra la memòria cau del navegador</string>
+	<string name="shortcut_erase_long_label" translatable="false">Esborra el lloc web navegat</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Esborreu les vostres dades i obriu el navegador</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Esborra la memòria cau del navegador</string>
+	<string name="shortcut_open" translatable="false">Reinicieu el navegador Genesis</string>
+	<string name="shortcut_open_long" translatable="false">Reinicieu El Navegador</string>
 
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Edita El Marcador</string>
@@ -22,24 +44,36 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">"Navegueu per Internet amb seguretat."</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"Sense seguiment. Sense censura".</string>
 
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">La connexió és segura</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">La vostra informació (per exemple, contrasenya o números de targeta de crèdit) és segura quan s’envia a aquest lloc</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Configuració De Seguretat</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Mantingueu segura la vostra identitat i utilitzeu les opcions següents</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">No Feu Un Seguiment</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Direm als llocs que no us facin un seguiment</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Protecció De Seguiment</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Activa la protecció de seguiment proporcionada per nosaltres</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Certificat</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Informació Del Certificat</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">registres de proxy</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Informació del registre del sistema</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">si teniu problemes de connectivitat mentre comenceu el Genesis, copieu el codi següent i cerqueu el problema en línia o envieu-nos-el perquè puguem intentar ajudar-vos</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
 
 
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">cerqueu alguna cosa o escriviu un enllaç web</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">trobar a la pàgina</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">motor de cerca</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! alguna cosa ha fallat</string>
-	<string name="GENERAL_TODO" translatable="true">tot</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">llibertat digital</string>
-	<string name="GENERAL_RELOAD" translatable="true">recarregar</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">us trobeu amb el problema següent. pot ser que la pàgina web o el lloc web no funcionin. és possible que la vostra connexió a Internet sigui deficient. és possible que utilitzeu un servidor intermediari. el tallafoc podria bloquejar el lloc web</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC, Israel torna a atacar</string>
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -216,9 +250,6 @@
 	<string name="ALERT_ADD" translatable="true">D\'acord</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">nou marcador</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">la connexió és segura</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">la vostra informació (per exemple, la contrasenya o els números de la targeta de crèdit) és privada quan s’envia a aquest lloc</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Configuració de la vigilància del sistema i de l\'usuari</string>
 	<string name="ALERT_REPORT" translatable="true">informe</string>
 	<string name="ALERT_REPORT_URL" translatable="true">lloc web d\'informes</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">si creieu que aquest URL és il·legal o inquietant, informeu-nos-el perquè puguem emprendre accions legals</string>
@@ -286,9 +317,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">registres de proxy</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Informació del registre del sistema</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">si teniu problemes de connectivitat mentre comenceu el Genesis, copieu el codi següent i cerqueu el problema en línia o envieu-nos-el perquè puguem intentar ajudar-vos</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot registres</string>
@@ -383,7 +411,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">les pestanyes obertes es mostraran aquí</string>
 
 
diff --git a/app/src/main/res/values-ch/strings.xml b/app/src/main/res/values-ch/strings.xml
index 6bf18d4d..d4b4ef9b 100644
--- a/app/src/main/res/values-ch/strings.xml
+++ b/app/src/main/res/values-ch/strings.xml
@@ -1,5 +1,27 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">prohledat něco nebo napsat webový odkaz</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">najít na stránce</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">vyhledávač</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">operace! něco se pokazilo</string>
+	<string name="GENERAL_TODO" translatable="true">všechno</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">digitální svoboda</string>
+	<string name="GENERAL_RELOAD" translatable="true">Znovu načíst</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">čelíte jednomu z následujících problémů. webová stránka nebo web nemusí fungovat. vaše připojení k internetu může být špatné. možná používáte proxy. web může být blokován bránou firewall</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Izrael znovu udeří</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Vymazat mezipaměť prohlížeče</string>
+	<string name="shortcut_erase_long_label" translatable="false">Vymazat procházený web</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Vymažte svá data a otevřete prohlížeč</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Vymazat mezipaměť prohlížeče</string>
+	<string name="shortcut_open" translatable="false">Restartujte prohlížeč Genesis</string>
+	<string name="shortcut_open_long" translatable="false">Restartujte Prohlížeč</string>
 
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Upravit Záložku</string>
@@ -22,22 +44,41 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">„Bezpečně a bezpečně procházejte internet.“</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">„Žádné sledování. Žádná cenzura.“</string>
 
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">Připojení je zabezpečené</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Vaše informace (například heslo nebo čísla kreditních karet) jsou při odeslání na tento web zabezpečené</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Nastavení Zabezpečení</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Chraňte svoji identitu a použijte níže uvedené možnosti</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Nesledovat</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Řekneme webům, aby vás nesledovaly</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Ochrana Proti Sledování</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Povolit námi poskytovanou ochranu sledování</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Osvědčení</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Informace O Certifikátu</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">protokoly proxy</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Informace o systémovém protokolu</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">pokud se při spuštění Genesis potýkáte s problémem s připojením, zkopírujte prosím následující kód a vyhledejte problém online nebo nám jej pošlete, abychom se vám mohli pokusit pomoci</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">prohledat něco nebo napsat webový odkaz</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">najít na stránce</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">vyhledávač</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">operace! něco se pokazilo</string>
-	<string name="GENERAL_TODO" translatable="true">všechno</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">digitální svoboda</string>
-	<string name="GENERAL_RELOAD" translatable="true">Znovu načíst</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">čelíte jednomu z následujících problémů. webová stránka nebo web nemusí fungovat. vaše připojení k internetu může být špatné. možná používáte proxy. web může být blokován bránou firewall</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Izrael znovu udeří</string>
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -215,9 +256,6 @@
 	<string name="ALERT_ADD" translatable="true">OK</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">nová záložka</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">připojení je zabezpečené</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">vaše informace (například heslo nebo čísla kreditních karet) jsou při odeslání na tento web soukromé</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Nastavení sledování systému a uživatelů</string>
 	<string name="ALERT_REPORT" translatable="true">zpráva</string>
 	<string name="ALERT_REPORT_URL" translatable="true">nahlásit web</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">pokud si myslíte, že je tato adresa URL nezákonná nebo znepokojující, nahlaste nám ji, abychom mohli podniknout právní kroky</string>
@@ -285,9 +323,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">protokoly proxy</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Informace o systémovém protokolu</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">pokud se při spuštění Genesis potýkáte s problémem s připojením, zkopírujte prosím následující kód a vyhledejte problém online nebo nám jej pošlete, abychom se vám mohli pokusit pomoci</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot protokolů</string>
@@ -382,7 +417,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">zde se zobrazí otevřené karty</string>
 
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 54f445c5..eb099346 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,5 +1,27 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">Suche etwas oder tippe einen Weblink</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">auf Seite finden</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">Suchmaschine</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! etwas ist schief gelaufen</string>
+	<string name="GENERAL_TODO" translatable="true">alles</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">digitale Freiheit</string>
+	<string name="GENERAL_RELOAD" translatable="true">neu laden</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">Sie stehen vor einem der folgenden Probleme. Webseite oder Website funktioniert möglicherweise nicht. Ihre Internetverbindung ist möglicherweise schlecht. Möglicherweise verwenden Sie einen Proxy. Die Website wird möglicherweise von der Firewall blockiert</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israel schlägt erneut zu</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Browsercache löschen</string>
+	<string name="shortcut_erase_long_label" translatable="false">Durchsuchte Website löschen</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Daten löschen und Browser öffnen</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Browsercache löschen</string>
+	<string name="shortcut_open" translatable="false">Genesis-Browser neu starten</string>
+	<string name="shortcut_open_long" translatable="false">Starten Sie Ihren Browser Neu</string>
 
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Lesezeichen Bearbeiten</string>
@@ -22,21 +44,42 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">"Durchsuchen Sie das Internet sicher und geschützt."</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"Keine Verfolgung. Keine Zensur."</string>
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">Suche etwas oder tippe einen Weblink</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">auf Seite finden</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">Suchmaschine</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! etwas ist schief gelaufen</string>
-	<string name="GENERAL_TODO" translatable="true">alles</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">digitale Freiheit</string>
-	<string name="GENERAL_RELOAD" translatable="true">neu laden</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">Sie stehen vor einem der folgenden Probleme. Webseite oder Website funktioniert möglicherweise nicht. Ihre Internetverbindung ist möglicherweise schlecht. Möglicherweise verwenden Sie einen Proxy. Die Website wird möglicherweise von der Firewall blockiert</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israel schlägt erneut zu</string>
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">Verbindung ist sicher</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Ihre Informationen (z. B. Passwort oder Kreditkartennummern) sind sicher, wenn sie an diese Site gesendet werden</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Sicherheitseinstellung</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Schützen Sie Ihre Identität und verwenden Sie die folgenden Optionen</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Nicht Verfolgen</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Wir werden Websites anweisen, Sie nicht zu verfolgen</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Tracking-Schutz</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Von uns bereitgestellten Tracking-Schutz aktivieren</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Zertifikat</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Zertifikatsinformationen</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">Proxy-Protokolle</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Systemprotokollinformationen</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">Wenn beim Starten von Genesis Konnektivitätsprobleme auftreten, kopieren Sie bitte den folgenden Code und suchen Sie das Problem online oder senden Sie es an uns, damit wir versuchen können, Ihnen zu helfen</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -214,9 +257,6 @@
 	<string name="ALERT_ADD" translatable="true">OK</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">neues Lesezeichen</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">Verbindung ist sicher</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Ihre Informationen (z. B. Passwort oder Kreditkartennummern) sind privat, wenn sie an diese Site gesendet werden</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">System- und Benutzerüberwachungseinstellung</string>
 	<string name="ALERT_REPORT" translatable="true">Bericht</string>
 	<string name="ALERT_REPORT_URL" translatable="true">report website</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">Wenn Sie der Meinung sind, dass diese URL illegal oder störend ist, melden Sie sie uns, damit wir rechtliche Schritte einleiten können</string>
@@ -284,9 +324,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">Proxy-Protokolle</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Systemprotokollinformationen</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">Wenn beim Starten von Genesis Konnektivitätsprobleme auftreten, kopieren Sie bitte den folgenden Code und suchen Sie das Problem online oder senden Sie es an uns, damit wir versuchen können, Ihnen zu helfen</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot Protokolle</string>
@@ -381,7 +418,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">Hier werden geöffnete Registerkarten angezeigt</string>
 
 
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 6384a381..deb0b867 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">αναζήτηση κάτι ή πληκτρολογήστε έναν σύνδεσμο ιστού</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">βρείτε στη σελίδα</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">μηχανή αναζήτησης</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">αντίθετα! κάτι πήγε στραβά</string>
+	<string name="GENERAL_TODO" translatable="true">τα παντα</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">ψηφιακή ελευθερία</string>
+	<string name="GENERAL_RELOAD" translatable="true">φορτώνω πάλι</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">αντιμετωπίζετε ένα από τα ακόλουθα προβλήματα. η ιστοσελίδα ή ο ιστότοπος ενδέχεται να μην λειτουργούν. η σύνδεσή σας στο Διαδίκτυο μπορεί να είναι κακή. μπορεί να χρησιμοποιείτε διακομιστή μεσολάβησης. Ο ιστότοπος ενδέχεται να αποκλειστεί από το τείχος προστασίας</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Το Ισραήλ χτυπά ξανά</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Διαγραφή προσωρινής μνήμης προγράμματος περιήγησης</string>
+	<string name="shortcut_erase_long_label" translatable="false">Διαγραφή περιηγημένου ιστότοπου</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Διαγράψτε τα δεδομένα σας και ανοίξτε το πρόγραμμα περιήγησης</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Διαγραφή προσωρινής μνήμης προγράμματος περιήγησης</string>
+	<string name="shortcut_open" translatable="false">Επανεκκινήστε το πρόγραμμα περιήγησης genesis</string>
+	<string name="shortcut_open_long" translatable="false">Επανεκκινήστε το πρόγραμμα περιήγησής σας</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Επεξεργασία σελιδοδείκτη</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Όνομα σελιδοδείκτη</string>
@@ -21,21 +44,38 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">"Περιηγηθείτε στο Διαδίκτυο με ασφάλεια και ασφάλεια."</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"Χωρίς παρακολούθηση. Χωρίς λογοκρισία."</string>
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">αναζήτηση κάτι ή πληκτρολογήστε έναν σύνδεσμο ιστού</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">βρείτε στη σελίδα</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">μηχανή αναζήτησης</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">αντίθετα! κάτι πήγε στραβά</string>
-	<string name="GENERAL_TODO" translatable="true">τα παντα</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">ψηφιακή ελευθερία</string>
-	<string name="GENERAL_RELOAD" translatable="true">φορτώνω πάλι</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">αντιμετωπίζετε ένα από τα ακόλουθα προβλήματα. η ιστοσελίδα ή ο ιστότοπος ενδέχεται να μην λειτουργούν. η σύνδεσή σας στο Διαδίκτυο μπορεί να είναι κακή. μπορεί να χρησιμοποιείτε διακομιστή μεσολάβησης. Ο ιστότοπος ενδέχεται να αποκλειστεί από το τείχος προστασίας</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Το Ισραήλ χτυπά ξανά</string>
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">Η σύνδεση είναι ασφαλής</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Τα στοιχεία σας (για παράδειγμα, κωδικοί πρόσβασης ή αριθμοί πιστωτικών καρτών) είναι ασφαλή όταν αποστέλλονται σε αυτόν τον ιστότοπο</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Ρύθμιση ασφάλειας</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Διατηρήστε την ταυτότητά σας ασφαλή και χρησιμοποιήστε τις παρακάτω επιλογές</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Μην παρακολουθείτε</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Θα πούμε στους ιστότοπους να μην σας παρακολουθούν</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Προστασία παρακολούθησης</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Ενεργοποίηση προστασίας παρακολούθησης που παρέχεται από εμάς</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Πιστοποιητικό</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Πληροφορίες πιστοποιητικού</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">αρχεία καταγραφής διακομιστή μεσολάβησης</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Πληροφορίες καταγραφής συστήματος</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">εάν αντιμετωπίζετε πρόβλημα συνδεσιμότητας κατά την έναρξη του Genesis, αντιγράψτε τον ακόλουθο κώδικα και βρείτε το πρόβλημα στο διαδίκτυο ή στείλτε τον σε εμάς, ώστε να μπορούμε να σας βοηθήσουμε</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -213,9 +253,6 @@
 	<string name="ALERT_ADD" translatable="true">Εντάξει</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">νέος σελιδοδείκτης</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">η σύνδεση είναι ασφαλής</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">τα στοιχεία σας (για παράδειγμα, κωδικοί πρόσβασης ή αριθμοί πιστωτικών καρτών) είναι προσωπικά όταν αποστέλλονται σε αυτόν τον ιστότοπο</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Ρύθμιση παρακολούθησης συστήματος και χρήστη</string>
 	<string name="ALERT_REPORT" translatable="true">κανω ΑΝΑΦΟΡΑ</string>
 	<string name="ALERT_REPORT_URL" translatable="true">αναφέρετε τον ιστότοπο</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">εάν πιστεύετε ότι αυτή η διεύθυνση URL είναι παράνομη ή ενοχλητική, αναφέρετέ την σε εμάς, ώστε να μπορέσουμε να λάβουμε νομικά μέτρα</string>
@@ -283,9 +320,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">αρχεία καταγραφής διακομιστή μεσολάβησης</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Πληροφορίες καταγραφής συστήματος</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">εάν αντιμετωπίζετε πρόβλημα συνδεσιμότητας κατά την έναρξη του Genesis, αντιγράψτε τον ακόλουθο κώδικα και βρείτε το πρόβλημα στο διαδίκτυο ή στείλτε τον σε εμάς, ώστε να μπορούμε να σας βοηθήσουμε</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot αρχεία καταγραφής</string>
@@ -380,7 +414,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">θα ανοίξουν οι καρτέλες εδώ</string>
 
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4672ddc1..d6793eb7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,5 +1,27 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">rechercher quelque chose ou saisir un lien Web</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">trouver en page</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">moteur de recherche</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! quelque chose s\'est mal passé</string>
+	<string name="GENERAL_TODO" translatable="true">tout</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">liberté numérique</string>
+	<string name="GENERAL_RELOAD" translatable="true">recharger</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">vous êtes confronté à l\'un des problèmes suivants. la page Web ou le site Web peut ne pas fonctionner. votre connexion Internet est peut-être mauvaise. vous utilisez peut-être un proxy. le site Web peut être bloqué par le pare-feu</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israël frappe à nouveau</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Effacer le cache du navigateur</string>
+	<string name="shortcut_erase_long_label" translatable="false">Effacer le site Web consulté</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Effacez vos données et ouvrez le navigateur</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Effacer le cache du navigateur</string>
+	<string name="shortcut_open" translatable="false">Redémarrer le navigateur Genesis</string>
+	<string name="shortcut_open_long" translatable="false">Redémarrez Votre Navigateur</string>
 
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Modifier Le Signet</string>
@@ -22,21 +44,69 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">« Naviguer sur Internet en toute sécurité. »</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"Pas de suivi. Pas de censure."</string>
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">rechercher quelque chose ou saisir un lien Web</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">trouver en page</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">moteur de recherche</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! quelque chose s\'est mal passé</string>
-	<string name="GENERAL_TODO" translatable="true">tout</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">liberté numérique</string>
-	<string name="GENERAL_RELOAD" translatable="true">recharger</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">vous êtes confronté à l\'un des problèmes suivants. la page Web ou le site Web peut ne pas fonctionner. votre connexion Internet est peut-être mauvaise. vous utilisez peut-être un proxy. le site Web peut être bloqué par le pare-feu</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israël frappe à nouveau</string>
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">La connexion est sécurisée</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Vos informations (par exemple, mot de passe ou numéros de carte de crédit) sont sécurisées lorsqu\'elles sont envoyées sur ce site</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Paramètre De Sécurité</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Protégez votre identité et utilisez les options ci-dessous</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Ne Pas Suivre</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Nous dirons aux sites de ne pas vous suivre</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Protection Contre Le Pistage</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Activer la protection de suivi fournie par nous</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Certificat</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Informations Sur Le Certificat</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">journaux proxy</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Informations du journal système</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">si vous rencontrez un problème de connectivité lors du démarrage de Genesis, veuillez copier le code suivant et trouver le problème en ligne ou nous l\'envoyer, afin que nous puissions essayer de vous aider</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -214,9 +284,6 @@
 	<string name="ALERT_ADD" translatable="true">d\'accord</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">nouveau signet</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">la connexion est sécurisée</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">vos informations (par exemple, mot de passe ou numéros de carte de crédit) sont privées lorsqu\'elles sont envoyées à ce site</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Paramètres de surveillance du système et de l\'utilisateur</string>
 	<string name="ALERT_REPORT" translatable="true">rapport</string>
 	<string name="ALERT_REPORT_URL" translatable="true">rapport site Web</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">si vous pensez que cette URL est illégale ou dérangeante, signalez-la-nous afin que nous puissions intenter une action en justice</string>
@@ -284,9 +351,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">journaux proxy</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Informations du journal système</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">si vous rencontrez un problème de connectivité lors du démarrage de Genesis, veuillez copier le code suivant et trouver le problème en ligne ou nous l\'envoyer, afin que nous puissions essayer de vous aider</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot journaux</string>
@@ -381,7 +445,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">les onglets ouverts s\'afficheront ici</string>
 
 
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 3af57136..76cc057c 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">keresni valamiben, vagy beírni egy weblinket</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">megtalálja az oldalon</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">keresőmotor</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! valami elromlott</string>
+	<string name="GENERAL_TODO" translatable="true">minden</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">digitális szabadság</string>
+	<string name="GENERAL_RELOAD" translatable="true">újratöltés</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">a következő probléma egyikével áll szemben. előfordulhat, hogy egy weboldal vagy webhely nem működik. gyenge lehet az internetkapcsolat. lehet, hogy proxyt használ. előfordulhat, hogy a webhelyet tűzfal blokkolja</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Izrael újra sztrájkol</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">A böngésző gyorsítótárának törlése</string>
+	<string name="shortcut_erase_long_label" translatable="false">A böngészett webhely törlése</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Törölje az adatait, és nyissa meg a böngészőt</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">A böngésző gyorsítótárának törlése</string>
+	<string name="shortcut_open" translatable="false">Indítsa újra a genezis böngészőt Indítsa újra a böngészőt</string>
+	<string name="shortcut_open_long" translatable="false">Restart Application</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Könyvjelző Szerkesztése</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Könyvjelző Neve</string>
@@ -21,23 +44,48 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">"Böngésszen biztonságosan és biztonságosan az interneten."</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"Nincs nyomkövetés. Nincs cenzúra."</string>
 
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">A kapcsolat biztonságos</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Adatai (például jelszó vagy hitelkártya-számok) biztonságosak, amikor elküldik ezt a webhelyet Biztonsági beállítás</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Tartsa biztonságban személyazonosságát, és használja az alábbi lehetőségeket</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Ne kövesse</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Azt Mondjuk Az Oldalaknak, Hogy Ne Kövessék Önt</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Nyomkövetés védelme Engedélyezze az általunk biztosított követésvédelmet</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Tanúsítvány</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Tanúsítványra vonatkozó információk</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Certificate</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Certificate Information</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">proxy naplók</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Rendszernapló információ</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">Ha kapcsolódási problémával néz szembe az Genesis indítása közben, kérjük, másolja a következő kódot, és keresse meg online a problémát, vagy küldje el nekünk, így megpróbálhatunk segíteni</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">keresni valamiben, vagy beírni egy weblinket</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">megtalálja az oldalon</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">keresőmotor</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! valami elromlott</string>
-	<string name="GENERAL_TODO" translatable="true">minden</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">digitális szabadság</string>
-	<string name="GENERAL_RELOAD" translatable="true">újratöltés</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">a következő probléma egyikével áll szemben. előfordulhat, hogy egy weboldal vagy webhely nem működik. gyenge lehet az internetkapcsolat. lehet, hogy proxyt használ. előfordulhat, hogy a webhelyet tűzfal blokkolja</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Izrael újra sztrájkol</string>
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -215,9 +263,6 @@
 	<string name="ALERT_ADD" translatable="true">ok</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">új könyvjelző</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">a kapcsolat biztonságos</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">az Ön adatai (például jelszó vagy hitelkártyaszámok) privátak, amikor erre a webhelyre küldik őket</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">A rendszer és a felhasználó felügyeletének beállítása</string>
 	<string name="ALERT_REPORT" translatable="true">jelentés</string>
 	<string name="ALERT_REPORT_URL" translatable="true">jelentés honlapja</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">ha úgy gondolja, hogy ez az URL illegális vagy zavaró, jelezze nekünk, hogy jogi lépéseket tegyünk</string>
@@ -285,9 +330,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">proxy naplók</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Rendszernapló információ</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">Ha kapcsolódási problémával néz szembe az Genesis indítása közben, kérjük, másolja a következő kódot, és keresse meg online a problémát, vagy küldje el nekünk, így megpróbálhatunk segíteni</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot rönk</string>
@@ -382,7 +424,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">a megnyitott lapok itt jelennek meg</string>
 
 
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index e8450311..20235f66 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -1,5 +1,24 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="GENERAL_SEARCH_HINT" translatable="true">zoek iets of typ een weblink</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">vind op pagina</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">zoekmachine</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! er is iets misgegaan</string>
+	<string name="GENERAL_TODO" translatable="true">todo</string>
+	<string name="GENERAL_LOADING" translatable="true">digitale vrijheid</string>
+	<string name="GENERAL_RELOAD" translatable="true">herladen</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">u wordt geconfronteerd met een van de volgende problemen. webpagina of website werkt mogelijk niet. uw internetverbinding is mogelijk slecht. misschien gebruikt u een proxy. website wordt mogelijk geblokkeerd door firewall</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC, Israël Slaat Weer Toe</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Browsercache wissen</string>
+	<string name="shortcut_erase_long_label" translatable="false">Doorbladerde website wissen</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Wis uw gegevens en open browser</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Browsercache wissen</string>
+	<string name="shortcut_open" translatable="false">Start Genesis-browser opnieuw</string>
+	<string name="shortcut_open_long" translatable="false">Herstart Je Browser</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Sunting Penanda</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Nama Penanda</string>
@@ -20,18 +39,51 @@
 	<string name="LANDING_WELCOME" translatable="true">"Selamat datang di Genesis di ponsel."</string>
 	<string name="LANDING_BROWSE_INFO" translatable="true">"Jelajahi internet dengan aman dan aman."</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"Tidak ada pelacakan. Tidak ada sensor."</string>
+
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">Koneksi aman</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Informasi Anda (misalnya, kata sandi atau nomor kartu kredit) aman saat dikirim ke situs ini</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Pengaturan Keamanan</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Amankan identitas Anda dan gunakan opsi di bawah</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Jangan Lacak</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Kami akan memberi tahu situs untuk tidak melacak Anda</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Perlindungan Pelacakan</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Aktifkan perlindungan pelacakan yang disediakan oleh kami</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Sertifikat</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Informasi Sertifikat</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">als u een verbindingsprobleem ondervindt bij het starten van Genesis, kopieer dan de volgende code en zoek het probleem online of stuur het naar ons, zodat we kunnen proberen u te helpen</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Orbot logboeken</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">if you are facing connectivity issue while starting Genesis please copy the following code and find issue online or send it to us, so we can try to help you out </string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-	<!-- Application Strings -->
-	<string name="GENERAL_SEARCH_HINT" translatable="true">zoek iets of typ een weblink</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">vind op pagina</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">zoekmachine</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! er is iets misgegaan</string>
-	<string name="GENERAL_TODO" translatable="true">todo</string>
-	<string name="GENERAL_LOADING" translatable="true">digitale vrijheid</string>
-	<string name="GENERAL_RELOAD" translatable="true">herladen</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">u wordt geconfronteerd met een van de volgende problemen. webpagina of website werkt mogelijk niet. uw internetverbinding is mogelijk slecht. misschien gebruikt u een proxy. website wordt mogelijk geblokkeerd door firewall</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC, Israël Slaat Weer Toe</string>
 
 	<!-- Settings -->
 	<string name="SETTING_BASIC_SETTING" translatable="true">Systeeminstelling</string>
@@ -199,9 +251,6 @@
 	<string name="ALERT_CLEAR" translatable="true">annuleren</string>
 	<string name="ALERT_ADD" translatable="true">oké</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">nieuwe bladwijzer</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">verbinding is beveiligd</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">uw informatie (bijvoorbeeld wachtwoord of creditcardnummers) is privé wanneer deze naar deze site wordt verzonden</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Instelling voor systeem- en gebruikersbewaking</string>
 	<string name="ALERT_REPORT" translatable="true">rapport</string>
 	<string name="ALERT_REPORT_URL" translatable="true">rapport website</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">als u denkt dat deze URL illegaal of storend is, meld dit dan aan ons, zodat we juridische stappen kunnen ondernemen</string>
@@ -268,9 +317,6 @@
 	<string name="BRIDGE_OBFS4" translatable="true">proxy-logboeken</string>
 
 	<!-- Orbot Log -->
-	<string name="ORBOT_LOG" translatable="true">als u een verbindingsprobleem ondervindt bij het starten van Genesis, kopieer dan de volgende code en zoek het probleem online of stuur het naar ons, zodat we kunnen proberen u te helpen</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Orbot logboeken</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">if you are facing connectivity issue while starting Genesis please copy the following code and find issue online or send it to us, so we can try to help you out </string>
 
 	<!-- Popup Menu -->
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">tabblad sluiten</string>
@@ -423,7 +469,6 @@
 	</string-array>
     <string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0b882a43..5e85218d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">cerca qualcosa o digita un collegamento web</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">trova nella pagina</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">motore di ricerca</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! qualcosa è andato storto</string>
+	<string name="GENERAL_TODO" translatable="true">qualunque cosa</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">libertà digitale</string>
+	<string name="GENERAL_RELOAD" translatable="true">ricaricare</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">stai affrontando uno dei seguenti problemi. la pagina web o il sito web potrebbero non funzionare. la tua connessione Internet potrebbe essere scarsa. potresti utilizzare un proxy. il sito Web potrebbe essere bloccato dal firewall</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israele colpisce ancora</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Cancella la cache del browser</string>
+	<string name="shortcut_erase_long_label" translatable="false">Cancella il sito web visitato</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Cancella i tuoi dati e apri il browser</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Cancella la cache del browser</string>
+	<string name="shortcut_open" translatable="false">Riavvia il browser di genesi</string>
+	<string name="shortcut_open_long" translatable="false">Riavvia Il Browser</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Modifica Segnalibro</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Nome Segnalibro</string>
@@ -21,21 +44,45 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">"Naviga in Internet in modo sicuro e protetto."</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"Nessun monitoraggio. Nessuna censura."</string>
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">cerca qualcosa o digita un collegamento web</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">trova nella pagina</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">motore di ricerca</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! qualcosa è andato storto</string>
-	<string name="GENERAL_TODO" translatable="true">qualunque cosa</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">libertà digitale</string>
-	<string name="GENERAL_RELOAD" translatable="true">ricaricare</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">stai affrontando uno dei seguenti problemi. la pagina web o il sito web potrebbero non funzionare. la tua connessione Internet potrebbe essere scarsa. potresti utilizzare un proxy. il sito Web potrebbe essere bloccato dal firewall</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israele colpisce ancora</string>
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">La connessione è sicura</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Le tue informazioni (ad esempio, password o numeri di carta di credito) sono al sicuro quando vengono inviate a questo sito</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Impostazioni Di Sicurezza</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Mantieni la tua identità al sicuro e usa le opzioni qui sotto</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Non Tenere Traccia</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Diremo ai siti di non seguirti</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Protezione Da Tracciamento</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Abilita la protezione di tracciamento fornita da noi</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Certificato</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Informazioni Sul Certificato</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">registri proxy</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Informazioni sul registro di sistema</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">se stai riscontrando problemi di connettività durante l\'avvio di Genesis, copia il seguente codice e trova il problema online o invialo a noi, così possiamo provare ad aiutarti</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -213,9 +260,6 @@
 	<string name="ALERT_ADD" translatable="true">ok</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">nuovo segnalibro</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">la connessione è sicura</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">le tue informazioni (ad esempio, password o numeri di carta di credito) sono private quando vengono inviate a questo sito</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Impostazioni di sorveglianza del sistema e dell\'utente</string>
 	<string name="ALERT_REPORT" translatable="true">rapporto</string>
 	<string name="ALERT_REPORT_URL" translatable="true">sito web di report</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">se ritieni che questo URL sia illegale o inquietante, segnalacelo, così possiamo intraprendere un\'azione legale</string>
@@ -283,9 +327,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">registri proxy</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Informazioni sul registro di sistema</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">se stai riscontrando problemi di connettività durante l\'avvio di Genesis, copia il seguente codice e trova il problema online o invialo a noi, così possiamo provare ad aiutarti</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot registri</string>
@@ -380,7 +421,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">le schede aperte verranno visualizzate qui</string>
 
 
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 059af45d..6beeb094 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">何かを検索するか、Webリンクを入力します</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">ページで見つける</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">検索エンジン</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">おっと！何かがうまくいかなかった</string>
+	<string name="GENERAL_TODO" translatable="true">すべて</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">デジタルの自由</string>
+	<string name="GENERAL_RELOAD" translatable="true">リロード</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">次のいずれかの問題が発生しています。ウェブページまたはウェブサイトが機能していない可能性があります。インターネット接続が悪い可能性があります。プロキシを使用している可能性があります。ウェブサイトがファイアウォールによってブロックされている可能性があります</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC |イスラエルが再びストライキ</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">ブラウザのキャッシュを消去する</string>
+	<string name="shortcut_erase_long_label" translatable="false">閲覧したウェブサイトを消去する</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">データを消去してブラウザを開く</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">ブラウザのキャッシュを消去する</string>
+	<string name="shortcut_open" translatable="false">ジェネシスブラウザを再起動します</string>
+	<string name="shortcut_open_long" translatable="false">ブラウザを再起動します</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">ブックマークの編集</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">ブックマーク名</string>
@@ -21,23 +44,46 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">「インターネットを安全かつ確実に閲覧してください。」</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">「追跡なし。検閲なし。」</string>
 
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">接続は安全です</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">あなたの情報（例えば、パスワードやクレジットカード番号）は、このサイトに送信されるときに安全です。 セキュリティ設定</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">あなたの身元を安全に保ち、以下のオプションを使用してください</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">追跡しない</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">私たちはあなたを追跡しないようにサイトに伝えます</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">追跡保護</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">当社が提供する追跡保護を有効にする</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">証明書</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">証明書情報</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">証明書情報</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">プロキシログ</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">システムログ情報</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">Genesisの開始中に接続の問題が発生した場合は、次のコードをコピーしてオンラインで問題を見つけるか、送信してください。サポートを提供します。</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">何かを検索するか、Webリンクを入力します</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">ページで見つける</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">検索エンジン</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">おっと！何かがうまくいかなかった</string>
-	<string name="GENERAL_TODO" translatable="true">すべて</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">デジタルの自由</string>
-	<string name="GENERAL_RELOAD" translatable="true">リロード</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">次のいずれかの問題が発生しています。ウェブページまたはウェブサイトが機能していない可能性があります。インターネット接続が悪い可能性があります。プロキシを使用している可能性があります。ウェブサイトがファイアウォールによってブロックされている可能性があります</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC |イスラエルが再びストライキ</string>
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -215,9 +261,6 @@
 	<string name="ALERT_ADD" translatable="true">OK</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">新しいブックマーク</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">接続は安全です</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">あなたの情報（例えば、パスワードやクレジットカード番号）は、このサイトに送信されるときに非公開になります</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">システムとユーザーの監視設定</string>
 	<string name="ALERT_REPORT" translatable="true">報告する</string>
 	<string name="ALERT_REPORT_URL" translatable="true">レポートのウェブサイト</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">このURLが違法または迷惑であると思われる場合は、Googleに報告してください。そうすれば、法的措置を取ることができます。</string>
@@ -285,9 +328,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">プロキシログ</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">システムログ情報</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">Genesisの開始中に接続の問題が発生した場合は、次のコードをコピーしてオンラインで問題を見つけるか、送信してください。サポートを提供します。</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbotログ</string>
@@ -382,7 +422,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">開いているタブがここに表示されます</string>
 
 
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 4b861691..f2f6f155 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">무언가를 검색하거나 웹 링크를 입력</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">페이지에서 찾기</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">검색 엔진</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! 뭔가 잘못 됐어</string>
+	<string name="GENERAL_TODO" translatable="true">모두</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">디지털 자유</string>
+	<string name="GENERAL_RELOAD" translatable="true">재 장전</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">다음 문제 중 하나에 직면하고 있습니다. 웹 페이지 또는 웹 사이트가 작동하지 않을 수 있습니다. 인터넷 연결 상태가 좋지 않을 수 있습니다. 프록시를 사용하고있을 수 있습니다. 웹 사이트가 방화벽에 의해 차단 될 수 있음</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | 이스라엘이 다시 공격하다</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">브라우저 캐시 지우기</string>
+	<string name="shortcut_erase_long_label" translatable="false">탐색한 웹사이트 지우기</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">데이터를 지우고 브라우저를 엽니다</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">브라우저 캐시 지우기</string>
+	<string name="shortcut_open" translatable="false">제네시스 브라우저 다시 시작</string>
+	<string name="shortcut_open_long" translatable="false">브라우저 다시 시작</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">북마크 수정</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">북마크 이름</string>
@@ -20,23 +43,53 @@
 	<string name="LANDING_WELCOME" translatable="true">"모바일 Genesis 에 오신 것을 환영합니다."</string>
 	<string name="LANDING_BROWSE_INFO" translatable="true">"안전하고 안전하게 인터넷을 탐색하십시오."</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"추적 없음. 검열 없음."</string>
+
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">연결이 안전합니다</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">귀하의 정보(예: 비밀번호 또는 신용 카드 번호)는 이 사이트로 전송될 때 안전합니다</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">보안 설정</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">자바스크립트</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">IDήλθατεity를 안전하게 유지하고 아래 옵션을 사용하세요</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">추적 금지</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">사이트에 사용자를 추적하지 않도록 지시합니다</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">추적 보호</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">당사에서 제공하는 추적 보호 활성화</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">인증서</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">인증서 정보</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">프록시 로그</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">시스템 로그 정보</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">Genesis을 시작하는 동안 연결 문제가 발생하는 경우 다음 코드를 복사하여 온라인에서 문제를 찾거나 저희에게 보내 주시면 도움을 드릴 수 있습니다.</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">무언가를 검색하거나 웹 링크를 입력</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">페이지에서 찾기</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">검색 엔진</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! 뭔가 잘못 됐어</string>
-	<string name="GENERAL_TODO" translatable="true">모두</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">디지털 자유</string>
-	<string name="GENERAL_RELOAD" translatable="true">재 장전</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">다음 문제 중 하나에 직면하고 있습니다. 웹 페이지 또는 웹 사이트가 작동하지 않을 수 있습니다. 인터넷 연결 상태가 좋지 않을 수 있습니다. 프록시를 사용하고있을 수 있습니다. 웹 사이트가 방화벽에 의해 차단 될 수 있음</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | 이스라엘이 다시 공격하다</string>
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -214,9 +267,6 @@
 	<string name="ALERT_ADD" translatable="true">확인</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">새 북마크</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">연결이 안전합니다</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">귀하의 정보 (예 : 비밀번호 또는 신용 카드 번호)는이 사이트로 전송 될 때 비공개입니다.</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">시스템 및 사용자 감시 설정</string>
 	<string name="ALERT_REPORT" translatable="true">보고서</string>
 	<string name="ALERT_REPORT_URL" translatable="true">웹 사이트 신고</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">이 URL이 불법이거나 방해가된다고 생각되는 경우 Google에 신고하여 법적 조치를 취할 수 있습니다.</string>
@@ -284,9 +334,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">프록시 로그</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">시스템 로그 정보</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">Genesis을 시작하는 동안 연결 문제가 발생하는 경우 다음 코드를 복사하여 온라인에서 문제를 찾거나 저희에게 보내 주시면 도움을 드릴 수 있습니다.</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot 로그</string>
@@ -381,7 +428,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">열린 탭이 여기에 표시됩니다.</string>
 
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index b61dc404..224de172 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -19,6 +19,7 @@
     <color name="c_ripple_gray">#808080</color>
     <color name="c_alert_toast_button_background">#ffffff</color>
     <color name="c_alert_toast_button_text">#3385ff</color>
+    <color name="c_icon_tint">#6483b4</color>
 
     /* Text Colors Version*/
 
@@ -29,6 +30,19 @@
 
     <color name="c_bookmark_settings_header_icon_tint">#ffffff</color>
 
+    /* Alerts */
+
+    <color name="c_secure_alert_start">#1c1b21</color>
+    <color name="c_secure_alert_end">#1c1b21</color>
+    <color name="c_secure_alert_border">#2d2d39</color>
+    <color name="c_secure_alert_background">#99000000</color>
+    <color name="c_secure_alert_button">#2d2d39</color>
+    <color name="c_secure_alert_button_pressed">#16161d</color>
+
+    /* Orbot Logs */
+
+    <color name="c_orbot_background">#18171c</color>
+
     /* Customs Colors */
 
     <color name="c_background_alpha">#60ffffff</color>
@@ -57,8 +71,8 @@
     <color name="c_button">#33cccc</color>
     <color name="c_checkbox_tint">#33cccc</color>
     <color name="c_checkbox_tint_default">#ffffff</color>
-    <color name="c_border_background">#18161d</color>
     <color name="c_border_background_divider">#808080</color>
+    <color name="c_border_background">#18161d</color>
     <color name="c_font_change_background">#161618</color>
     <color name="c_font_change_foreground">#ffffff</color>
     <color name="c_seekbar_progress">#33cccc</color>
@@ -83,6 +97,7 @@
     <color name="c_menu_drop_shadow_25">#00000000</color>
     <color name="c_text_home_menu">#ffffff</color>
     <color name="c_hint_text">#b3b3b3</color>
+    <color name="c_setting_icon_tint">#8c8c8c</color>
     <color name="c_list_item_current">#161519</color>
     <color name="c_lock_tint">#f2f2f2</color>
     <color name="c_lock_text">#00b300</color>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1e108025..d9039111 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,5 +1,24 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="GENERAL_SEARCH_HINT" translatable="true">Zoek of typ een webadres</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">Zoek op pagina</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">Zoekmachine</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">\ U0020 \ U0020 \ U0020Opps! Er Is Iets Misgegaan</string>
+	<string name="GENERAL_TODO" translatable="true">TODO</string>
+	<string name="GENERAL_LOADING" translatable="true">Online Vrijheid</string>
+	<string name="GENERAL_RELOAD" translatable="true">Opnieuw laden</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">Dit kunnen de problemen zijn waarmee u wordt geconfronteerd \ n \ n • De webpagina of website is mogelijk niet beschikbaar \ n • Uw internetverbinding is mogelijk slecht \ n • U gebruikt mogelijk een proxy \ n • De website is mogelijk geblokkeerd door een firewall</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israel Strikes Again</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Browsercache wissen</string>
+	<string name="shortcut_erase_long_label" translatable="false">Doorbladerde website wissen</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Wis uw gegevens en open browser</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Browsercache wissen</string>
+	<string name="shortcut_open" translatable="false">Start Genesis-browser opnieuw</string>
+	<string name="shortcut_open_long" translatable="false">Herstart Je Browser</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Bladwijzer Bewerken</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Naam Bladwijzer</string>
@@ -20,18 +39,59 @@
 	<string name="LANDING_WELCOME" translatable="true">"Welkom bij Genesis op mobiel."</string>
 	<string name="LANDING_BROWSE_INFO" translatable="true">"Browse veilig op internet."</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"Geen tracking. Geen censuur."</string>
+
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">Verbinding is beveiligd</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Uw informatie (bijvoorbeeld wachtwoord of creditcardnummers) is veilig wanneer deze naar deze site wordt verzonden</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Beveiligingsinstelling</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Houd uw identiteit veilig en gebruik de onderstaande opties</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Niet Volgen</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">We zullen sites vertellen u niet te volgen</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Bescherming Tegen Volgen</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Door ons geleverde trackingbeveiliging inschakelen</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Certificaat</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Informatie Over Het Certificaat</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">Proxylogboeken</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Logboeken Info</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">If you are facing connectivity issue while starting Genesis please copy the following code and find issue online or send it to us, so we can try to help you out </string>
+	<string name="ORBOT_LOADING_STATIC" translatable="true">Genesis op standby op dit moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-	<!-- Application Strings -->
-	<string name="GENERAL_SEARCH_HINT" translatable="true">Zoek of typ een webadres</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">Zoek op pagina</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">Zoekmachine</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">\ U0020 \ U0020 \ U0020Opps! Er Is Iets Misgegaan</string>
-	<string name="GENERAL_TODO" translatable="true">TODO</string>
-	<string name="GENERAL_LOADING" translatable="true">Online Vrijheid</string>
-	<string name="GENERAL_RELOAD" translatable="true">Opnieuw laden</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">Dit kunnen de problemen zijn waarmee u wordt geconfronteerd \ n \ n • De webpagina of website is mogelijk niet beschikbaar \ n • Uw internetverbinding is mogelijk slecht \ n • U gebruikt mogelijk een proxy \ n • De website is mogelijk geblokkeerd door een firewall</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israel Strikes Again</string>
 
 	<!-- Settings -->
 	<string name="SETTING_BASIC_SETTING" translatable="true">Basisinstellingen</string>
@@ -200,9 +260,6 @@
 	<string name="ALERT_CLEAR" translatable="true">Wissen</string>
 	<string name="ALERT_ADD" translatable="true">Klaar</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">Nieuwe Bladwijzer</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">Verbinding is veilig</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Uw informatie (bijvoorbeeld wachtwoord of creditcardnummers) is privé wanneer deze naar deze site wordt verzonden</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Privacy-instellingen</string>
 	<string name="ALERT_REPORT" translatable="true">Rapport</string>
 	<string name="ALERT_REPORT_URL" translatable="true">Website Melden</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">Als u denkt dat deze URL illegaal of storend is, meld dit dan aan ons, zodat we juridische stappen kunnen ondernemen</string>
@@ -268,10 +325,6 @@
 	<string name="BRIDGE_OBFS4" translatable="true">obfs4 (Recommended)</string>
 	<string name="BRIDGE_MEEK" translatable="true">Meek-azure (China)</string>
 
-	<!-- Orbot Log -->
-	<string name="ORBOT_LOG" translatable="true">Proxylogboeken</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Logboeken Info</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">If you are facing connectivity issue while starting Genesis please copy the following code and find issue online or send it to us, so we can try to help you out </string>
 
 	<!-- Popup Menu -->
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot-logboeken</string>
@@ -365,7 +418,6 @@
 	<!-- Home View -->
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_LOADING" translatable="true">Idle | Genesis on standby at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="true">Genesis op standby op dit moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">Open tabbladen worden hier weergegeven</string>
 
 	<!-- Error Page -->
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 987d3b26..4156e61e 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,5 +1,29 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">pesquise algo ou digite um link da web</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">encontrar na página</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">motor de busca</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! algo deu errado</string>
+	<string name="GENERAL_TODO" translatable="true">todo</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">digital freedom</string>
+	<string name="GENERAL_RELOAD" translatable="true">recarregar</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">você está enfrentando um dos seguintes problemas. página da Web ou site pode não estar funcionando. sua conexão com a internet pode estar ruim. você pode estar usando um proxy. site pode estar bloqueado por firewall</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israel ataca novamente</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Apagar o cache do navegador</string>
+	<string name="shortcut_erase_long_label" translatable="false">Apagar site navegado</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Apague seus dados e abra o navegador</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Apagar o cache do navegador</string>
+	<string name="shortcut_open" translatable="false">Reinicie o navegador genesis</string>
+	<string name="shortcut_open_long" translatable="false">Reinicie O Seu Navegador</string>
+
+	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Editar Favorito</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Nome Do Marcador</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">O nome do url favorito será mostrado aqui</string>
@@ -20,22 +44,43 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">"Navegue na Internet com segurança e segurança."</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"Sem rastreamento. Sem censura."</string>
 
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">A conexão é segura</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Suas informações (por exemplo, senha ou números de cartão de crédito) estão seguras quando enviadas para este site</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Configuração De Segurança</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Mantenha sua identidade segura e use as opções abaixo</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Não Rastreie</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Diremos aos sites para não rastreá-lo</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Proteção Contra Rastreamento</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Habilite a proteção de rastreamento fornecida por nós</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Certificado</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Informações Do Certificado</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">logs de proxy</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Informações de registro do sistema</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">se você estiver enfrentando problemas de conectividade ao iniciar o Genesis, copie o código a seguir e encontre o problema online ou envie-o para nós, para que possamos tentar ajudá-lo</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">pesquise algo ou digite um link da web</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">encontrar na página</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">motor de busca</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! algo deu errado</string>
-	<string name="GENERAL_TODO" translatable="true">todo</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">digital freedom</string>
-	<string name="GENERAL_RELOAD" translatable="true">recarregar</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">você está enfrentando um dos seguintes problemas. página da Web ou site pode não estar funcionando. sua conexão com a internet pode estar ruim. você pode estar usando um proxy. site pode estar bloqueado por firewall</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israel ataca novamente</string>
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -213,9 +258,6 @@
 	<string name="ALERT_ADD" translatable="true">OK</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">novo favorito</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">conexão é segura</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">suas informações (por exemplo, senha ou números de cartão de crédito) são privadas quando são enviadas para este site</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Configuração de vigilância do sistema e do usuário</string>
 	<string name="ALERT_REPORT" translatable="true">relatório</string>
 	<string name="ALERT_REPORT_URL" translatable="true">site do relatório</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">se você acha que este URL é ilegal ou perturbador, informe-nos para que possamos tomar medidas legais</string>
@@ -283,9 +325,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">logs de proxy</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Informações de registro do sistema</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">se você estiver enfrentando problemas de conectividade ao iniciar o Genesis, copie o código a seguir e encontre o problema online ou envie-o para nós, para que possamos tentar ajudá-lo</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Genesis Logs</string>
@@ -380,7 +419,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">abas abertas serão mostradas aqui</string>
 
 
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 71045136..00980190 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">căutați ceva sau tastați un weblink</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">găsiți în pagina</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">motor de căutare</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! ceva nu a mers bine</string>
+	<string name="GENERAL_TODO" translatable="true">Tot</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">libertatea digitală</string>
+	<string name="GENERAL_RELOAD" translatable="true">reîncărcați</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">vă confruntați cu una dintre următoarele probleme. este posibil ca pagina web sau site-ul web să nu funcționeze. conexiunea la internet ar putea fi slabă. s-ar putea să utilizați un proxy. site-ul web ar putea fi blocat de firewall</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israelul lovește din nou</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Ștergeți memoria cache a browserului</string>
+	<string name="shortcut_erase_long_label" translatable="false">Ștergeți site-ul navigat</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Ștergeți-vă datele și deschideți browserul</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Ștergeți memoria cache a browserului</string>
+	<string name="shortcut_open" translatable="false">Reporniți browserul Genesis</string>
+	<string name="shortcut_open_long" translatable="false">Reporniți Browserul</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Editați Marcajul</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Nume Marcaj</string>
@@ -21,22 +44,47 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">„Răsfoiți internetul în siguranță.”</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"Fără urmărire. Fără cenzură."</string>
 
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">Conexiunea este securizată</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Informațiile dvs. (de exemplu, parola sau numerele cardului de credit) sunt sigure atunci când sunt trimise pe acest site</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Setări De Securitate</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Păstrați-vă identitatea în siguranță și utilizați opțiunile de mai jos</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Nu Urmăriți Vom Spune Site-urilor Să Nu Vă Urmărească</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Protecție de urmărire</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Activați Protecția De Urmărire Furnizată De Noi</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Certificat</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Informații despre certificat</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Certificate Information</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">jurnale proxy</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Informații jurnal sistem</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">dacă vă confruntați cu o problemă de conectivitate în timp ce începeți Genesis, vă rugăm să copiați următorul cod și să găsiți problema online sau să ni-l trimiteți, astfel încât să putem încerca să vă ajutăm</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">căutați ceva sau tastați un weblink</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">găsiți în pagina</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">motor de căutare</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">opps! ceva nu a mers bine</string>
-	<string name="GENERAL_TODO" translatable="true">Tot</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">libertatea digitală</string>
-	<string name="GENERAL_RELOAD" translatable="true">reîncărcați</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">vă confruntați cu una dintre următoarele probleme. este posibil ca pagina web sau site-ul web să nu funcționeze. conexiunea la internet ar putea fi slabă. s-ar putea să utilizați un proxy. site-ul web ar putea fi blocat de firewall</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israelul lovește din nou</string>
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -214,9 +262,6 @@
 	<string name="ALERT_ADD" translatable="true">Bine</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">semn de carte nou</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">conexiunea este sigură</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">informațiile dvs. (de exemplu, parola sau numerele cardului de credit) sunt private atunci când sunt trimise pe acest site</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Setare supraveghere sistem și utilizator</string>
 	<string name="ALERT_REPORT" translatable="true">raport</string>
 	<string name="ALERT_REPORT_URL" translatable="true">raportați site-ul web</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">dacă credeți că această adresă URL este ilegală sau deranjantă, raportați-ne, astfel încât să putem acționa în justiție</string>
@@ -284,9 +329,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">jurnale proxy</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Informații jurnal sistem</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">dacă vă confruntați cu o problemă de conectivitate în timp ce începeți Genesis, vă rugăm să copiați următorul cod și să găsiți problema online sau să ni-l trimiteți, astfel încât să putem încerca să vă ajutăm</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot busteni</string>
@@ -381,7 +423,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">filele deschise se vor afișa aici</string>
 
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index be2ce286..c6c5224e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">найдите что-нибудь или введите ссылку</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">найти на странице</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">поисковый движок</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">опп! что-то пошло не так</string>
+	<string name="GENERAL_TODO" translatable="true">все</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">цифровая свобода</string>
+	<string name="GENERAL_RELOAD" translatable="true">перезагрузить</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">вы столкнулись с одной из следующих проблем. веб-страница или веб-сайт могут не работать. ваше интернет-соединение может быть плохим. вы можете использовать прокси. веб-сайт может быть заблокирован брандмауэром</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Израиль снова наносит удар</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Очистить кеш браузера</string>
+	<string name="shortcut_erase_long_label" translatable="false">Стереть просматриваемый сайт</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Сотрите данные и откройте браузер</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Очистить кеш браузера</string>
+	<string name="shortcut_open" translatable="false">Перезапустите браузер Genesis</string>
+	<string name="shortcut_open_long" translatable="false">Перезапустите ваш браузер</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Редактировать закладку</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Имя закладки</string>
@@ -20,24 +43,52 @@
 	<string name="LANDING_WELCOME" translatable="true">«Добро пожаловать в Genesis на мобильном телефоне».</string>
 	<string name="LANDING_BROWSE_INFO" translatable="true">«Работайте в Интернете безопасно и надежно».</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">«Без отслеживания. Без цензуры».</string>
+
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">Безопасное соединение</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Ваша информация (например, пароль или номера кредитных карт) в безопасности, когда она отправляется на этот сайт</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Настройки безопасности</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Сохраните свою личностьήλθατεity в безопасности и воспользуйтесь вариантами ниже</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Не отслеживать</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Скажем сайтам не отслеживать вас</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Защита от отслеживания</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Включить защиту от отслеживания, предоставленную нами</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Сертификат</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Справочная информация</string>
+
+	<!-- Alert Certificate -->
+	<string name="ORBOT_LOG" translatable="true">журналы прокси</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Информация системного журнала</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">Если вы столкнулись с проблемой подключения при запуске Genesis, скопируйте следующий код и найдите проблему в Интернете или отправьте ее нам, чтобы мы могли помочь вам</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">найдите что-нибудь или введите ссылку</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">найти на странице</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">поисковый движок</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">опп! что-то пошло не так</string>
-	<string name="GENERAL_TODO" translatable="true">все</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">цифровая свобода</string>
-	<string name="GENERAL_RELOAD" translatable="true">перезагрузить</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">вы столкнулись с одной из следующих проблем. веб-страница или веб-сайт могут не работать. ваше интернет-соединение может быть плохим. вы можете использовать прокси. веб-сайт может быть заблокирован брандмауэром</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Израиль снова наносит удар</string>
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -215,9 +266,6 @@
 	<string name="ALERT_ADD" translatable="true">Ok</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">новая закладка</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">соединение безопасно</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">ваша информация (например, пароль или номера кредитных карт) является конфиденциальной, когда она отправляется на этот сайт</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Настройка наблюдения за системой и пользователями</string>
 	<string name="ALERT_REPORT" translatable="true">отчет</string>
 	<string name="ALERT_REPORT_URL" translatable="true">веб-сайт отчета</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">если вы считаете, что этот URL является незаконным или тревожным, сообщите нам об этом, и мы примем меры в суд.</string>
@@ -285,9 +333,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">журналы прокси</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Информация системного журнала</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">Если вы столкнулись с проблемой подключения при запуске Genesis, скопируйте следующий код и найдите проблему в Интернете или отправьте ее нам, чтобы мы могли помочь вам</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot журналов</string>
@@ -382,7 +427,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">открытые вкладки будут отображаться здесь</string>
 
 
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 35c3e150..6c289c86 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">Genesis</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">ค้นหาบางสิ่งหรือพิมพ์เว็บลิงค์</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">ค้นหาในหน้า</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">เครื่องมือค้นหา</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">อป! มีบางอย่างผิดพลาด</string>
+	<string name="GENERAL_TODO" translatable="true">ทุกอย่าง</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+	<string name="GENERAL_LOADING" translatable="true">เสรีภาพดิจิทัล</string>
+	<string name="GENERAL_RELOAD" translatable="true">โหลดใหม่</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">คุณกำลังประสบปัญหาอย่างใดอย่างหนึ่งต่อไปนี้ หน้าเว็บหรือเว็บไซต์อาจไม่ทำงาน การเชื่อมต่ออินเทอร์เน็ตของคุณอาจไม่ดี คุณอาจใช้พร็อกซี เว็บไซต์อาจถูกปิดกั้นโดยไฟร์วอลล์</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | อิสราเอลนัดหยุดงานอีกครั้ง</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">ลบแคชของเบราว์เซอร์</string>
+	<string name="shortcut_erase_long_label" translatable="false">ลบเว็บไซต์ที่เรียกดู</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">ลบข้อมูลของคุณและเปิดเบราว์เซอร์</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">ลบแคชของเบราว์เซอร์</string>
+	<string name="shortcut_open" translatable="false">รีสตาร์ทเบราว์เซอร์ Genesis</string>
+	<string name="shortcut_open_long" translatable="false">รีสตาร์ทเบราว์เซอร์ของคุณ</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">แก้ไขบุ๊คมาร์ค</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">ชื่อบุ๊คมาร์ค</string>
@@ -21,24 +44,43 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">"ท่องอินเทอร์เน็ตอย่างปลอดภัย"</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"ไม่มีการติดตาม ไม่มีการเซ็นเซอร์"</string>
 
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">การเชื่อมต่อมีความปลอดภัย</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">ข้อมูลของคุณ (เช่น รหัสผ่านหรือหมายเลขบัตรเครดิต) จะปลอดภัยเมื่อถูกส่งไปยังไซต์นี้</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">การตั้งค่าความปลอดภัย</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">รักษาข้อมูลประจำตัวของคุณให้ปลอดภัยและใช้ตัวเลือกด้านล่าง</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">อย่าติดตาม</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">เราจะแจ้งเว็บไซต์ไม่ให้ติดตามคุณ</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">การป้องกันการติดตาม</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">เปิดใช้งานการป้องกันการติดตามโดยเรา</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">ใบรับรอง</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">ข้อมูลใบรับรอง</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">บันทึกพร็อกซี</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">ข้อมูลบันทึกระบบ</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">หากคุณประสบปัญหาการเชื่อมต่อในขณะที่เริ่มต้น Genesis โปรดคัดลอกรหัสต่อไปนี้และค้นหาปัญหาทางออนไลน์หรือส่งมาให้เราเพื่อที่เราจะได้ช่วยเหลือคุณ</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">Genesis</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">ค้นหาบางสิ่งหรือพิมพ์เว็บลิงค์</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">ค้นหาในหน้า</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">เครื่องมือค้นหา</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">อป! มีบางอย่างผิดพลาด</string>
-	<string name="GENERAL_TODO" translatable="true">ทุกอย่าง</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-	<string name="GENERAL_LOADING" translatable="true">เสรีภาพดิจิทัล</string>
-	<string name="GENERAL_RELOAD" translatable="true">โหลดใหม่</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">คุณกำลังประสบปัญหาอย่างใดอย่างหนึ่งต่อไปนี้ หน้าเว็บหรือเว็บไซต์อาจไม่ทำงาน การเชื่อมต่ออินเทอร์เน็ตของคุณอาจไม่ดี คุณอาจใช้พร็อกซี เว็บไซต์อาจถูกปิดกั้นโดยไฟร์วอลล์</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | อิสราเอลนัดหยุดงานอีกครั้ง</string>
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -216,9 +258,6 @@
 	<string name="ALERT_ADD" translatable="true">ตกลง</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">บุ๊คมาร์คใหม่</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">การเชื่อมต่อมีความปลอดภัย</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">ข้อมูลของคุณ (เช่นรหัสผ่านหรือหมายเลขบัตรเครดิต) จะเป็นข้อมูลส่วนตัวเมื่อส่งไปยังไซต์นี้</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">การตั้งค่าระบบและการเฝ้าระวังผู้ใช้</string>
 	<string name="ALERT_REPORT" translatable="true">รายงาน</string>
 	<string name="ALERT_REPORT_URL" translatable="true">รายงานเว็บไซต์</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">หากคุณคิดว่า URL นี้ผิดกฎหมายหรือเป็นการรบกวนโปรดรายงานให้เราทราบเพื่อให้เราดำเนินการทางกฎหมายได้</string>
@@ -286,9 +325,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">บันทึกพร็อกซี</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">ข้อมูลบันทึกระบบ</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">หากคุณประสบปัญหาการเชื่อมต่อในขณะที่เริ่มต้น Genesis โปรดคัดลอกรหัสต่อไปนี้และค้นหาปัญหาทางออนไลน์หรือส่งมาให้เราเพื่อที่เราจะได้ช่วยเหลือคุณ</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">บันทึก Orbot</string>
@@ -383,7 +419,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">แท็บที่เปิดจะแสดงที่นี่</string>
 
 
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 23101f20..848acff1 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+    <!-- Application Strings -->
+    <string name="app_name" translatable="false">Genesis</string>
+    <string name="GENERAL_SEARCH_HINT" translatable="true">bir şey arayın veya bir web bağlantısı yazın</string>
+    <string name="GENERAL_FIND_HINT" translatable="true">sayfada bul</string>
+    <string name="GENERAL_SEARCH_ENGINE" translatable="true">arama motoru</string>
+    <string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+    <string name="GENERAL_ERROR_TITLE" translatable="true">opps! bir şeyler ters gitti</string>
+    <string name="GENERAL_TODO" translatable="true">herşey</string>
+    <string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+    <string name="GENERAL_LOADING" translatable="true">dijital özgürlük</string>
+    <string name="GENERAL_RELOAD" translatable="true">Tekrar yükle</string>
+    <string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">aşağıdaki problemlerden biriyle karşı karşıyasınız. web sayfası veya web sitesi çalışmıyor olabilir. İnternet bağlantınız zayıf olabilir. bir proxy kullanıyor olabilirsiniz. web sitesi güvenlik duvarı tarafından engelleniyor olabilir</string>
+    <string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+    <string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | İsrail Yeniden Grevde</string>
+
+    <!-- Shortcuts -->
+    <string name="shortcut_erase_short_label" translatable="false">Tarayıcı önbelleğini sil</string>
+    <string name="shortcut_erase_long_label" translatable="false">Taranan web sitesini sil</string>
+    <string name="shortcut_erase_and_open_short_label" translatable="false">Verilerinizi silin ve tarayıcıyı açın</string>
+    <string name="shortcut_erase_and_open_long_label" translatable="false">Tarayıcı önbelleğini sil</string>
+    <string name="shortcut_open" translatable="false">Genesis tarayıcısını yeniden başlatın</string>
+    <string name="shortcut_open_long" translatable="false">Tarayıcınızı Yeniden Başlatın</string>
+
     <!-- Bookmark Setting -->
     <string name="BOOKMARK_SETTING_HEADER" translatable="true">Yer İşaretini Düzenle</string>
     <string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Yer İşareti Adı</string>
@@ -21,25 +44,46 @@
     <string name="LANDING_BROWSE_INFO" translatable="true">"İnternette güvenli ve güvenli bir şekilde gezinin."</string>
     <string name="LANDING_NO_TRACKING" translatable="true">"İzleme yok. Sansür yok."</string>
 
+    <!-- Alert Secure -->
+    <string name="ALERT_SECURE_INFO" translatable="true">Bağlantı güvenli</string>
+    <string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Bilgileriniz (örneğin, şifre veya kredi kartı numaraları) bu siteye gönderildiğinde güvendedir</string>
+    <string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Güvenlik Ayarı</string>
+    <string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+    <string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Kimliğinizi güvende tutun ve aşağıdaki seçenekleri kullanın</string>
+    <string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Takip Etme</string>
+    <string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Sitelere sizi izlememelerini söyleyeceğiz</string>
+    <string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">İzleme Koruması</string>
+    <string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Tarafımızdan sağlanan izleme korumasını etkinleştirin</string>
+    <string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Sertifika</string>
+
+    <!-- Alert Certificate -->
+    <string name="ALERT_CERTIFICATE_HEADER" translatable="true">Sertifika Bilgisi</string>
+
+    <!-- Orbot Log -->
+    <string name="ORBOT_LOG" translatable="true">proxy günlükleri</string>
+    <string name="ORBOT_LOG_HEADER" translatable="true">Sistem Günlüğü bilgisi</string>
+    <string name="ORBOT_LOG_INFO" translatable="true">Genesis\'e başlarken bağlantı sorunu yaşıyorsanız, lütfen aşağıdaki kodu kopyalayın ve çevrimiçi sorunu bulun veya bize gönderin, böylece size yardımcı olmaya çalışabiliriz</string>
+    <string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
-    <!-- Generated by Automatic String Resource Translation -->
-    <!--          https://asrt.gluege.boerde.de             -->
-    <string name="app_name" translatable="false">Genesis</string>
-    <string name="GENERAL_SEARCH_HINT" translatable="true">bir şey arayın veya bir web bağlantısı yazın</string>
-    <string name="GENERAL_FIND_HINT" translatable="true">sayfada bul</string>
-    <string name="GENERAL_SEARCH_ENGINE" translatable="true">arama motoru</string>
-    <string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-    <string name="GENERAL_ERROR_TITLE" translatable="true">opps! bir şeyler ters gitti</string>
-    <string name="GENERAL_TODO" translatable="true">herşey</string>
-    <string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-    <string name="GENERAL_LOADING" translatable="true">dijital özgürlük</string>
-    <string name="GENERAL_RELOAD" translatable="true">Tekrar yükle</string>
-    <string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">aşağıdaki problemlerden biriyle karşı karşıyasınız. web sayfası veya web sitesi çalışmıyor olabilir. İnternet bağlantınız zayıf olabilir. bir proxy kullanıyor olabilirsiniz. web sitesi güvenlik duvarı tarafından engelleniyor olabilir</string>
-    <string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-    <string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | İsrail Yeniden Grevde</string>
 
 
     <string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -217,9 +261,6 @@
     <string name="ALERT_ADD" translatable="true">Tamam mı</string>
     <string name="ALERT_TITLE_ADD" translatable="true">yeni yer imi</string>
     <string name="ALERT_SECURE" translatable="false">https://</string>
-    <string name="ALERT_SECURE_INFO" translatable="true">bağlantı güvenli</string>
-    <string name="ALERT_SECURE_INFO_DETAIL" translatable="true">bilgileriniz (örneğin, şifre veya kredi kartı numaraları) bu siteye gönderildiğinde özeldir</string>
-    <string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Sistem ve Kullanıcı Gözetim Ayarı</string>
     <string name="ALERT_REPORT" translatable="true">bildiri</string>
     <string name="ALERT_REPORT_URL" translatable="true">web sitesini bildir</string>
     <string name="ALERT_REPORT_URL_INFO" translatable="true">Bu URL\'nin yasa dışı veya rahatsız edici olduğunu düşünüyorsanız, bize bildirin, böylece yasal işlem yapabiliriz</string>
@@ -287,9 +328,6 @@
     <string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-    <string name="ORBOT_LOG" translatable="true">proxy günlükleri</string>
-    <string name="ORBOT_LOG_HEADER" translatable="true">Sistem Günlüğü bilgisi</string>
-    <string name="ORBOT_LOG_INFO" translatable="true">Genesis\'e başlarken bağlantı sorunu yaşıyorsanız, lütfen aşağıdaki kodu kopyalayın ve çevrimiçi sorunu bulun veya bize gönderin, böylece size yardımcı olmaya çalışabiliriz</string>
 
 
     <string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot günlükler</string>
@@ -384,7 +422,6 @@
     <string name="HOME_TAB_TEXT" translatable="true">1</string>
     <string name="HOME_CONNECT" translatable="false">connect</string>
     <string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-    <string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
     <string name="HOME_TAB_EMPTY" translatable="true">açık sekmeler burada gösterilecek</string>
 
 
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 185c3d02..9ef9079f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,5 +1,24 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="GENERAL_SEARCH_HINT" translatable="true">щось шукати або ввести веб-посилання</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">знайти на сторінці</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">пошукова система</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">Опс! щось пішло не так</string>
+	<string name="GENERAL_TODO" translatable="true">todo</string>
+	<string name="GENERAL_LOADING" translatable="true">цифрова свобода</string>
+	<string name="GENERAL_RELOAD" translatable="true">перезавантажити</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">Ви стикаєтесь із однією з наведених нижче проблем. веб-сторінка або веб-сайт можуть не працювати. з’єднання з Інтернетом може бути поганим. можливо, ви використовуєте проксі. веб-сайт може бути заблокований брандмауером</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">ВВС, Ізраїль знову страйкує Ru</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">Стерти кеш браузера</string>
+	<string name="shortcut_erase_long_label" translatable="false">Стерти веб-сайт, що переглядався</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">Видаліть свої дані та відкрийте браузер</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">Стерти кеш браузера</string>
+	<string name="shortcut_open" translatable="false">Перезапустіть браузер Genesis</string>
+	<string name="shortcut_open_long" translatable="false">Перезапустіть браузер</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Редагувати закладку</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Назва закладки</string>
@@ -21,22 +40,42 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">"Переглядайте Інтернет безпечно та надійно."</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"Без відстеження. Без цензури."</string>
 
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">З\'єднання безпечне</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Ваша інформація (наприклад, пароль або номери кредитних карток) захищена, коли вона надсилається на цей сайт</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Налаштування безпеки</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Бережіть свою ідентичність і використовуйте наведені нижче варіанти</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Не відстежувати</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Ми скажемо сайтам не відстежувати вас</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Захист від відстеження</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Увімкніть захист від відстеження, наданий нами</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Свідоцтво</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Інформація про сертифікат</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">Журнали проксі</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">Інформація про журнали</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">If you are facing connectivity issue while starting Genesis please copy the following code and find issue online or send it to us, so we can try to help you out </string>
+	<string name="ORBOT_LOADING_STATIC" translatable="true">Буття в режимі очікування на даний момент</string>
+
+
+
+
+
+
+
+
+
+
 
 
 
 
 
 
-	<!-- Application Strings -->
-	<string name="GENERAL_SEARCH_HINT" translatable="true">щось шукати або ввести веб-посилання</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">знайти на сторінці</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">пошукова система</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">Опс! щось пішло не так</string>
-	<string name="GENERAL_TODO" translatable="true">todo</string>
-	<string name="GENERAL_LOADING" translatable="true">цифрова свобода</string>
-	<string name="GENERAL_RELOAD" translatable="true">перезавантажити</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">Ви стикаєтесь із однією з наведених нижче проблем. веб-сторінка або веб-сайт можуть не працювати. з’єднання з Інтернетом може бути поганим. можливо, ви використовуєте проксі. веб-сайт може бути заблокований брандмауером</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">ВВС, Ізраїль знову страйкує Ru</string>
 
 	<!-- Settings -->
 	<string name="SETTING_BASIC_SETTING" translatable="true">Зробити 1111 браузером за замовчуванням</string>
@@ -207,9 +246,6 @@
 	<string name="ALERT_CLEAR" translatable="true">Очистити</string>
 	<string name="ALERT_ADD" translatable="true">Готово</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">Нова закладка</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">З\'єднання безпечне</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Ваша інформація (наприклад, пароль або номери кредитних карток) є приватною, коли вона надсилається на цей сайт</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Налаштування конфіденційності</string>
 	<string name="ALERT_REPORT" translatable="true">Звіт</string>
 	<string name="ALERT_REPORT_URL" translatable="true">Веб-сайт звітів</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">Якщо ви вважаєте, що ця URL-адреса є незаконною або тривожною, повідомте про це нам, щоб ми могли вжити юридичних заходів</string>
@@ -276,9 +312,6 @@
 	<string name="BRIDGE_MEEK" translatable="true">Лагідність (Китай)</string>
 
 	<!-- Orbot Log -->
-	<string name="ORBOT_LOG" translatable="true">Журнали проксі</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">Інформація про журнали</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">If you are facing connectivity issue while starting Genesis please copy the following code and find issue online or send it to us, so we can try to help you out </string>
 
 	<!-- Popup Menu -->
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">Журнали Orbot</string>
@@ -372,7 +405,6 @@
 	<!-- Home View -->
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_LOADING" translatable="true">Idle | Genesis on standby at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="true">Буття в режимі очікування на даний момент</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">Тут відкриються відкриті вкладки</string>
 
 	<!-- Error Page -->
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 6b80ddd3..fba9a59b 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+	<!-- Application Strings -->
+	<string name="app_name" translatable="false">جینیسز</string>
+	<string name="GENERAL_SEARCH_HINT" translatable="true">کچھ تلاش کریں یا ویب لنک ٹائپ کریں</string>
+	<string name="GENERAL_FIND_HINT" translatable="true">صفحے میں تلاش کریں</string>
+	<string name="GENERAL_SEARCH_ENGINE" translatable="true">سرچ انجن</string>
+	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+	<string name="GENERAL_ERROR_TITLE" translatable="true">اوپپس! کچھ غلط ہو گیا ہے</string>
+	<string name="GENERAL_TODO" translatable="true">سب کچھ</string>
+	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis Search Engine</string>
+	<string name="GENERAL_LOADING" translatable="true">ڈیجیٹل آزادی</string>
+	<string name="GENERAL_RELOAD" translatable="true">دوبارہ لوڈ کریں</string>
+	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">آپ کو مندرجہ ذیل میں سے ایک مسئلہ درپیش ہے۔ ہوسکتا ہے کہ ویب صفحہ یا ویب سائٹ کام نہیں کررہی ہے۔ ہوسکتا ہے کہ آپ کا انٹرنیٹ کنیکشن خراب ہو۔ آپ شاید ایک پراکسی استعمال کر رہے ہوں گے۔ ہوسکتا ہے کہ ویب سائٹ فائر وال کے ذریعے مسدود کردی جائے</string>
+	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">بی بی سی | اسرائیل نے ایک بار پھر حملہ کیا</string>
+
+	<!-- Shortcuts -->
+	<string name="shortcut_erase_short_label" translatable="false">برائوزر کیشے مٹا دیں</string>
+	<string name="shortcut_erase_long_label" translatable="false">برائوزڈ ویب سائٹ کو مٹا دیں</string>
+	<string name="shortcut_erase_and_open_short_label" translatable="false">اپنا ڈیٹا مٹا دیں اور براؤزر کھولیں</string>
+	<string name="shortcut_erase_and_open_long_label" translatable="false">برائوزر کیشے مٹا دیں جینیسیس براؤزر کو دوبارہ شروع کریں</string>
+	<string name="shortcut_open" translatable="false">اپنے براؤزر کو دوبارہ شروع کریں</string>
+	<string name="shortcut_open_long" translatable="false">Restart Application</string>
+
 	<!-- Bookmark Setting -->
 	<string name="BOOKMARK_SETTING_HEADER" translatable="true">بُک مارک میں ترمیم کریں</string>
 	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">بُک مارک کا نام</string>
@@ -21,24 +44,40 @@
 	<string name="LANDING_BROWSE_INFO" translatable="true">"انٹرنیٹ کو محفوظ طریقے سے براؤز کریں۔"</string>
 	<string name="LANDING_NO_TRACKING" translatable="true">"کوئی ٹریکنگ نہیں۔ کوئی سنسرشپ نہیں ہے۔"</string>
 
+	<!-- Alert Secure -->
+	<string name="ALERT_SECURE_INFO" translatable="true">رابطہ محفوظ ہے</string>
+	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">جب آپ کو اس سائٹ پر بھیجا جاتا ہے تو آپ کی معلومات (مثال کے طور پر پاس ورڈ یا کریڈٹ کارڈ نمبرز) محفوظ ہوتی ہیں سیکیورٹی کی ترتیب</string>
+	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">جاوا اسکرپٹ</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">اپنی شناخت کو محفوظ رکھیں اور نیچے کے اختیارات استعمال کریں ٹریک نہ کریں</string>
+	<string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">ہم سائٹوں کو بتائیں گے کہ آپ کو ٹریک نہ کریں</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">ٹریکنگ پروٹیکشن</string>
+	<string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">ہمارے ذریعہ فراہم کردہ ٹریکنگ تحفظ کو فعال کریں سند</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">سرٹیفکیٹ سے متعلق معلومات</string>
+	<string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Enable tracking protection provided by Genesis</string>
+	<string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Certificate</string>
+
+	<!-- Alert Certificate -->
+	<string name="ALERT_CERTIFICATE_HEADER" translatable="true">Certificate Information</string>
+
+	<!-- Orbot Log -->
+	<string name="ORBOT_LOG" translatable="true">پراکسی لاگز</string>
+	<string name="ORBOT_LOG_HEADER" translatable="true">سسٹم لاگ انفارمیشن</string>
+	<string name="ORBOT_LOG_INFO" translatable="true">اگر آپ جینیسز کو شروع کرتے وقت رابطہ کے مسئلے کا سامنا کر رہے ہیں تو ، براہ کرم مندرجہ ذیل کوڈ کو کاپی کریں اور مسئلہ آن لائن تلاش کریں یا ہمیں بھیجیں ، لہذا ہم آپ کی مدد کرنے کی کوشش کر سکتے ہیں</string>
+	<string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
 
 
 
-	<!-- Generated by Automatic String Resource Translation -->
-	<!--          https://asrt.gluege.boerde.de             -->
-	<string name="app_name" translatable="false">جینیسز</string>
-	<string name="GENERAL_SEARCH_HINT" translatable="true">کچھ تلاش کریں یا ویب لنک ٹائپ کریں</string>
-	<string name="GENERAL_FIND_HINT" translatable="true">صفحے میں تلاش کریں</string>
-	<string name="GENERAL_SEARCH_ENGINE" translatable="true">سرچ انجن</string>
-	<string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-	<string name="GENERAL_ERROR_TITLE" translatable="true">اوپپس! کچھ غلط ہو گیا ہے</string>
-	<string name="GENERAL_TODO" translatable="true">سب کچھ</string>
-	<string name="GENERAL_PROJECT_NAME" translatable="false">Genesis Search Engine</string>
-	<string name="GENERAL_LOADING" translatable="true">ڈیجیٹل آزادی</string>
-	<string name="GENERAL_RELOAD" translatable="true">دوبارہ لوڈ کریں</string>
-	<string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">آپ کو مندرجہ ذیل میں سے ایک مسئلہ درپیش ہے۔ ہوسکتا ہے کہ ویب صفحہ یا ویب سائٹ کام نہیں کررہی ہے۔ ہوسکتا ہے کہ آپ کا انٹرنیٹ کنیکشن خراب ہو۔ آپ شاید ایک پراکسی استعمال کر رہے ہوں گے۔ ہوسکتا ہے کہ ویب سائٹ فائر وال کے ذریعے مسدود کردی جائے</string>
-	<string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-	<string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">بی بی سی | اسرائیل نے ایک بار پھر حملہ کیا</string>
 
 
 	<string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -216,9 +255,6 @@
 	<string name="ALERT_ADD" translatable="true">ٹھیک ہے</string>
 	<string name="ALERT_TITLE_ADD" translatable="true">نیا بک مارک</string>
 	<string name="ALERT_SECURE" translatable="false">https://</string>
-	<string name="ALERT_SECURE_INFO" translatable="true">کنکشن محفوظ ہے</string>
-	<string name="ALERT_SECURE_INFO_DETAIL" translatable="true">جب آپ کو اس سائٹ پر بھیجا جاتا ہے تو آپ کی معلومات (مثال کے طور پر پاس ورڈ یا کریڈٹ کارڈ نمبرز) نجی ہوتی ہیں</string>
-	<string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">سسٹم اور صارف کی نگرانی کی ترتیب</string>
 	<string name="ALERT_REPORT" translatable="true">رپورٹ</string>
 	<string name="ALERT_REPORT_URL" translatable="true">رپورٹ ویب سائٹ</string>
 	<string name="ALERT_REPORT_URL_INFO" translatable="true">اگر آپ کو لگتا ہے کہ یہ یو آر ایل غیر قانونی یا پریشان کن ہے تو ہمیں اس کی اطلاع دیں ، لہذا ہم قانونی کارروائی کرسکتے ہیں</string>
@@ -286,9 +322,6 @@
 	<string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-	<string name="ORBOT_LOG" translatable="true">پراکسی لاگز</string>
-	<string name="ORBOT_LOG_HEADER" translatable="true">سسٹم لاگ انفارمیشن</string>
-	<string name="ORBOT_LOG_INFO" translatable="true">اگر آپ جینیسز کو شروع کرتے وقت رابطہ کے مسئلے کا سامنا کر رہے ہیں تو ، براہ کرم مندرجہ ذیل کوڈ کو کاپی کریں اور مسئلہ آن لائن تلاش کریں یا ہمیں بھیجیں ، لہذا ہم آپ کی مدد کرنے کی کوشش کر سکتے ہیں</string>
 
 
 	<string name="HOME_MENU__ORBOT_LOGS" translatable="true">جینیسز لاگ</string>
@@ -383,7 +416,6 @@
 	<string name="HOME_TAB_TEXT" translatable="true">1</string>
 	<string name="HOME_CONNECT" translatable="false">connect</string>
 	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 	<string name="HOME_TAB_EMPTY" translatable="true">کھلی ٹیبز یہاں دکھائی دیں گی</string>
 
 
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index e79f1dee..9f6d8443 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+    <!-- Application Strings -->
+    <string name="app_name" translatable="false">Genesis</string>
+    <string name="GENERAL_SEARCH_HINT" translatable="true">tìm kiếm thứ gì đó hoặc nhập một liên kết web</string>
+    <string name="GENERAL_FIND_HINT" translatable="true">Tìm ở trang</string>
+    <string name="GENERAL_SEARCH_ENGINE" translatable="true">máy tìm kiếm</string>
+    <string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+    <string name="GENERAL_ERROR_TITLE" translatable="true">opps! có gì đó không ổn</string>
+    <string name="GENERAL_TODO" translatable="true">mọi điều</string>
+    <string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+    <string name="GENERAL_LOADING" translatable="true">tự do kỹ thuật số</string>
+    <string name="GENERAL_RELOAD" translatable="true">tải lại</string>
+    <string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">bạn đang phải đối mặt với một trong những vấn đề sau. trang web hoặc trang web có thể không hoạt động. kết nối internet của bạn có thể kém. bạn có thể đang sử dụng proxy. trang web có thể bị tường lửa chặn</string>
+    <string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+    <string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israel lại tấn công</string>
+
+    <!-- Shortcuts -->
+    <string name="shortcut_erase_short_label" translatable="false">Xóa bộ nhớ cache của trình duyệt</string>
+    <string name="shortcut_erase_long_label" translatable="false">Xóa trang web đã duyệt</string>
+    <string name="shortcut_erase_and_open_short_label" translatable="false">Xóa dữ liệu của bạn và mở trình duyệt</string>
+    <string name="shortcut_erase_and_open_long_label" translatable="false">Xóa bộ nhớ cache của trình duyệt</string>
+    <string name="shortcut_open" translatable="false">Khởi động lại trình duyệt genesis</string>
+    <string name="shortcut_open_long" translatable="false">Khởi động Lại Trình Duyệt Của Bạn</string>
+
     <!-- Bookmark Setting -->
     <string name="BOOKMARK_SETTING_HEADER" translatable="true">Chỉnh Sửa Dấu Trang</string>
     <string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Tên Dấu Trang</string>
@@ -20,27 +43,57 @@
     <string name="LANDING_WELCOME" translatable="true">"Chào mừng bạn đến với Genesis trên điện thoại di động."</string>
     <string name="LANDING_BROWSE_INFO" translatable="true">"Duyệt Internet một cách an toàn và bảo mật."</string>
     <string name="LANDING_NO_TRACKING" translatable="true">"Không theo dõi. Không kiểm duyệt."</string>
+
+    <!-- Alert Secure -->
+    <string name="ALERT_SECURE_INFO" translatable="true">Kết nối an toàn</string>
+    <string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Thông tin của bạn (ví dụ: mật khẩu hoặc số thẻ tín dụng) được bảo mật khi nó được gửi đến trang web này</string>
+    <string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Cài đặt Bảo Mật</string>
+    <string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+    <string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Giữ an toàn cho danh tính của bạn và sử dụng các tùy chọn bên dưới</string>
+    <string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Không Theo Dõi</string>
+    <string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Chúng tôi sẽ thông báo cho các trang web không theo dõi bạn</string>
+    <string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Bảo Vệ Theo Dõi</string>
+    <string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Bật tính năng bảo vệ theo dõi do chúng tôi cung cấp</string>
+    <string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Giấy chứng nhận</string>
+
+    <!-- Alert Certificate -->
+    <string name="ALERT_CERTIFICATE_HEADER" translatable="true">Thông Tin Chứng Chỉ</string>
+
+    <!-- Orbot Log -->
+    <string name="ORBOT_LOG" translatable="true">nhật ký proxy</string>
+    <string name="ORBOT_LOG_HEADER" translatable="true">Thông tin nhật ký hệ thống</string>
+    <string name="ORBOT_LOG_INFO" translatable="true">nếu bạn gặp sự cố kết nối khi khởi động Genesis, vui lòng sao chép mã sau và tìm sự cố trực tuyến hoặc gửi cho chúng tôi, để chúng tôi có thể cố gắng giúp bạn</string>
+    <string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
 
 
-    <!-- Generated by Automatic String Resource Translation -->
-    <!--          https://asrt.gluege.boerde.de             -->
-    <string name="app_name" translatable="false">Genesis</string>
-    <string name="GENERAL_SEARCH_HINT" translatable="true">tìm kiếm thứ gì đó hoặc nhập một liên kết web</string>
-    <string name="GENERAL_FIND_HINT" translatable="true">Tìm ở trang</string>
-    <string name="GENERAL_SEARCH_ENGINE" translatable="true">máy tìm kiếm</string>
-    <string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-    <string name="GENERAL_ERROR_TITLE" translatable="true">opps! có gì đó không ổn</string>
-    <string name="GENERAL_TODO" translatable="true">mọi điều</string>
-    <string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-    <string name="GENERAL_LOADING" translatable="true">tự do kỹ thuật số</string>
-    <string name="GENERAL_RELOAD" translatable="true">tải lại</string>
-    <string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">bạn đang phải đối mặt với một trong những vấn đề sau. trang web hoặc trang web có thể không hoạt động. kết nối internet của bạn có thể kém. bạn có thể đang sử dụng proxy. trang web có thể bị tường lửa chặn</string>
-    <string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-    <string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">BBC | Israel lại tấn công</string>
 
 
     <string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -218,9 +271,6 @@
     <string name="ALERT_ADD" translatable="true">đồng ý</string>
     <string name="ALERT_TITLE_ADD" translatable="true">dấu trang mới</string>
     <string name="ALERT_SECURE" translatable="false">https://</string>
-    <string name="ALERT_SECURE_INFO" translatable="true">kết nối an toàn</string>
-    <string name="ALERT_SECURE_INFO_DETAIL" translatable="true">thông tin của bạn (ví dụ: mật khẩu hoặc số thẻ tín dụng) là riêng tư khi nó được gửi đến trang web này</string>
-    <string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Cài đặt giám sát hệ thống và người dùng</string>
     <string name="ALERT_REPORT" translatable="true">báo cáo</string>
     <string name="ALERT_REPORT_URL" translatable="true">báo cáo trang web</string>
     <string name="ALERT_REPORT_URL_INFO" translatable="true">nếu bạn cho rằng URL này bất hợp pháp hoặc đáng lo ngại, hãy báo cáo cho chúng tôi để chúng tôi có thể thực hiện hành động pháp lý</string>
@@ -288,9 +338,6 @@
     <string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-    <string name="ORBOT_LOG" translatable="true">nhật ký proxy</string>
-    <string name="ORBOT_LOG_HEADER" translatable="true">Thông tin nhật ký hệ thống</string>
-    <string name="ORBOT_LOG_INFO" translatable="true">nếu bạn gặp sự cố kết nối khi khởi động Genesis, vui lòng sao chép mã sau và tìm sự cố trực tuyến hoặc gửi cho chúng tôi, để chúng tôi có thể cố gắng giúp bạn</string>
 
 
     <string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot nhật ký</string>
@@ -385,7 +432,6 @@
     <string name="HOME_TAB_TEXT" translatable="true">1</string>
     <string name="HOME_CONNECT" translatable="false">connect</string>
     <string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-    <string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
     <string name="HOME_TAB_EMPTY" translatable="true">các tab đang mở sẽ hiển thị ở đây</string>
 
 
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 3740800e..e36c255d 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,5 +1,28 @@
 <resources>
 
+    <!-- Application Strings -->
+    <string name="app_name" translatable="false">Genesis</string>
+    <string name="GENERAL_SEARCH_HINT" translatable="true">搜索内容或输入网络链接</string>
+    <string name="GENERAL_FIND_HINT" translatable="true">在页面中查找</string>
+    <string name="GENERAL_SEARCH_ENGINE" translatable="true">搜索引擎</string>
+    <string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
+    <string name="GENERAL_ERROR_TITLE" translatable="true">哎呀！出问题了</string>
+    <string name="GENERAL_TODO" translatable="true">一切</string>
+    <string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
+    <string name="GENERAL_LOADING" translatable="true">数字自由</string>
+    <string name="GENERAL_RELOAD" translatable="true">重装</string>
+    <string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">您正面临以下问题之一。网页或网站可能无法正常工作。您的互联网连接可能不佳。您可能正在使用代理。网站可能被防火墙阻止</string>
+    <string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
+    <string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">英国广播公司|以色列再次罢工</string>
+
+    <!-- Shortcuts -->
+    <string name="shortcut_erase_short_label" translatable="false">清除浏览器缓存</string>
+    <string name="shortcut_erase_long_label" translatable="false">擦除浏览过的网站</string>
+    <string name="shortcut_erase_and_open_short_label" translatable="false">清除您的数据并打开浏览器</string>
+    <string name="shortcut_erase_and_open_long_label" translatable="false">清除浏览器缓存</string>
+    <string name="shortcut_open" translatable="false">重启创世浏览器</string>
+    <string name="shortcut_open_long" translatable="false">重新启动浏览器</string>
+
     <!-- Bookmark Setting -->
     <string name="BOOKMARK_SETTING_HEADER" translatable="true">编辑书签</string>
     <string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">书签名称</string>
@@ -21,25 +44,46 @@
     <string name="LANDING_BROWSE_INFO" translatable="true">“安全可靠地浏览互联网。”</string>
     <string name="LANDING_NO_TRACKING" translatable="true">“没有跟踪。没有审查。”</string>
 
+    <!-- Alert Secure -->
+    <string name="ALERT_SECURE_INFO" translatable="true">连接是安全的</string>
+    <string name="ALERT_SECURE_INFO_DETAIL" translatable="true">您的信息（例如密码或信用卡号）在发送到本网站时是安全的</string>
+    <string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">安全设置</string>
+    <string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+    <string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">确保您的身份ήλθατεity 安全并使用以下选项</string>
+    <string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">不跟踪</string>
+    <string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">我们会告诉网站不要跟踪您</string>
+    <string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">跟踪保护</string>
+    <string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">启用我们提供的跟踪保护</string>
+    <string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">证书</string>
+
+    <!-- Alert Certificate -->
+    <string name="ALERT_CERTIFICATE_HEADER" translatable="true">证书信息</string>
+
+    <!-- Orbot Log -->
+    <string name="ORBOT_LOG" translatable="true">代理日志</string>
+    <string name="ORBOT_LOG_HEADER" translatable="true">系统日志信息</string>
+    <string name="ORBOT_LOG_INFO" translatable="true">如果您在开始Genesis时遇到连接问题，请复制以下代码并在线查找问题或发送给我们，以便我们为您提供帮助</string>
+    <string name="ORBOT_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
-    <!-- Generated by Automatic String Resource Translation -->
-    <!--          https://asrt.gluege.boerde.de             -->
-    <string name="app_name" translatable="false">Genesis</string>
-    <string name="GENERAL_SEARCH_HINT" translatable="true">搜索内容或输入网络链接</string>
-    <string name="GENERAL_FIND_HINT" translatable="true">在页面中查找</string>
-    <string name="GENERAL_SEARCH_ENGINE" translatable="true">搜索引擎</string>
-    <string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
-    <string name="GENERAL_ERROR_TITLE" translatable="true">哎呀！出问题了</string>
-    <string name="GENERAL_TODO" translatable="true">一切</string>
-    <string name="GENERAL_PROJECT_NAME" translatable="false">Genesis search engine</string>
-    <string name="GENERAL_LOADING" translatable="true">数字自由</string>
-    <string name="GENERAL_RELOAD" translatable="true">重装</string>
-    <string name="GENERAL_INTERNET_ERROR_MESSAGE" translatable="true">您正面临以下问题之一。网页或网站可能无法正常工作。您的互联网连接可能不佳。您可能正在使用代理。网站可能被防火墙阻止</string>
-    <string name="GENERAL_FILE_PROVIDER_AUTHORITY" translatable="false">com.darkweb.genesissearchengine.production.provider</string>
-    <string name="GENERAL_DEFAULT_HINT_SUGGESTION" translatable="true">英国广播公司|以色列再次罢工</string>
 
 
     <string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -217,9 +261,6 @@
     <string name="ALERT_ADD" translatable="true">好的</string>
     <string name="ALERT_TITLE_ADD" translatable="true">新书签</string>
     <string name="ALERT_SECURE" translatable="false">https://</string>
-    <string name="ALERT_SECURE_INFO" translatable="true">连接是安全的</string>
-    <string name="ALERT_SECURE_INFO_DETAIL" translatable="true">您的信息（例如密码或信用卡号）在发送到本网站时是私人的</string>
-    <string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">系统和用户监视设置</string>
     <string name="ALERT_REPORT" translatable="true">报告</string>
     <string name="ALERT_REPORT_URL" translatable="true">报告网站</string>
     <string name="ALERT_REPORT_URL_INFO" translatable="true">如果您认为此网址不合法或令人不安，请向我们报告，以便我们采取法律措施</string>
@@ -287,9 +328,6 @@
     <string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
 
 
-    <string name="ORBOT_LOG" translatable="true">代理日志</string>
-    <string name="ORBOT_LOG_HEADER" translatable="true">系统日志信息</string>
-    <string name="ORBOT_LOG_INFO" translatable="true">如果您在开始Genesis时遇到连接问题，请复制以下代码并在线查找问题或发送给我们，以便我们为您提供帮助</string>
 
 
     <string name="HOME_MENU__ORBOT_LOGS" translatable="true">Orbot日志</string>
@@ -384,7 +422,6 @@
     <string name="HOME_TAB_TEXT" translatable="true">1</string>
     <string name="HOME_CONNECT" translatable="false">connect</string>
     <string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
-    <string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
     <string name="HOME_TAB_EMPTY" translatable="true">打开的标签将显示在这里</string>
 
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index aacf4497..2a9597d3 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -27,6 +27,7 @@
     <color name="c_ripple_gray">#d9d9d9</color>
     <color name="c_alert_toast_button_background">#b3b3b3</color>
     <color name="c_alert_toast_button_text">#ffffff</color>
+    <color name="c_icon_tint">#425e8a</color>
 
     /* Text Colors Version*/
 
@@ -41,6 +42,18 @@
 
     <color name="c_landing_page_background">#0A1727</color>
 
+    /* Alerts */
+
+    <color name="c_secure_alert_start">#ffffff</color>
+    <color name="c_secure_alert_end">#e8ebf8</color>
+    <color name="c_secure_alert_border">#7e7e9a</color>
+    <color name="c_secure_alert_background">#99000000</color>
+    <color name="c_secure_alert_button">#9b9bb0</color>
+    <color name="c_secure_alert_button_pressed">#7e7e9a</color>
+
+    /* Orbot Logs */
+
+    <color name="c_orbot_background">#f9f9f9</color>
 
     /* Customs Colors */
 
@@ -54,7 +67,6 @@
     <color name="c_text_v7">#7591bd</color>
     <color name="c_text_v8">#666666</color>
     <color name="c_text_v9">#7591bd</color>
-    <color name="c_icon_tint">#425e8a</color>
     <color name="c_lang_row">#7591bd</color>
     <color name="c_lang_row_border">#3a5278</color>
     <color name="c_button_text_v1">#3385ff</color>
@@ -65,15 +77,15 @@
     <color name="c_switch_theme">#3385ff</color>
     <color name="c_border_left">#123456</color>
     <color name="c_radio_tint">#4d88ff</color>
+    <color name="c_border_background">#f9f9f9</color>
     <color name="c_radio_tint_default">#4d88ff</color>
     <color name="c_button">#0066FF</color>
     <color name="c_checkbox_tint">#3385ff</color>
     <color name="c_checkbox_tint_default">#3385ff</color>
     <color name="c_edittext_background_blue">#f5f9ff</color>
-    <color name="c_border_background">#f9f9f9</color>
     <color name="c_border_background_divider">#f7f7f7</color>
     <color name="c_security_popup_background">#f5fff5</color>
-    <color name="c_security_popup_divider">#e0ffe0</color>
+    <color name="c_security_popup_divider">#e2e8f3</color>
     <color name="c_font_change_background">#e3e3e3</color>
     <color name="c_font_change_foreground">#212f45</color>
     <color name="c_seekbar_progress">#3385ff</color>
@@ -99,13 +111,13 @@
     <color name="c_tab_border">#6482b4</color>
     <color name="c_tab_image_border">#eef1f7</color>
     <color name="c_list_remove_back">#999999</color>
-    <color name="c_list_alpha_black">#50000000</color>
     <color name="c_text_home_menu">#212d45</color>
     <color name="c_hint_text">#b3b3b3</color>
     <color name="c_list_item_current">#f1f3f4</color>
     <color name="c_lock_tint">#00b300</color>
     <color name="c_lock_text">#00b300</color>
     <color name="c_home_side">#e3e3e3</color>
+    <color name="c_setting_icon_tint">#425e8a</color>
     <color name="c_menu_drop_shadow_05">#05e6e6e6</color>
     <color name="c_menu_drop_shadow_10">#10e6e6e6</color>
     <color name="c_menu_drop_shadow_15">#15e6e6e6</color>
@@ -155,7 +167,7 @@
     <color name="green_button">#00b33c</color>
     <color name="green_dark">#212d45</color>
     <color name="green_alert">#006666</color>
-    <color name="green_alert_dark">#004d4d</color>
+    <color name="green_alert_dark">#005c5c</color>
     <color name="green_dark_v1">#0A1727</color>
     <color name="green_dark_v2">#fafcff</color>
     <color name="dark_purple">#ffffff</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 310257ef..f3e60775 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,27 +1,5 @@
 <resources>
 
-    <!-- Bookmark Setting -->
-    <string name="BOOKMARK_SETTING_HEADER" translatable="true">Edit Bookmark</string>
-    <string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Bookmark Name</string>
-    <string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Name of bookmarked url will be shown here</string>
-    <string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Enter bookmark name…</string>
-
-    <!-- Bookmark Alerts -->
-    <string name="HOME_MENU__BOOKMARK_REMOVED" translatable="true">Bookmark removed</string>
-    <string name="HOME_MENU__BOOKMARK_UPDATE" translatable="true">Bookmark updated</string>
-
-    <!-- Alerts General -->
-    <string name="ALERT_DISMISS" translatable="true">Dismiss</string>
-
-    <!-- Landing Page -->
-    <string name="LANDING_BRIDGES_INFO" translatable="true">"Sometimes you need a Bridge to get to Tor Network"</string>
-    <string name="LANDING_MORE" translatable="true">"TELL ME MORE"</string>
-    <string name="LANDING_HELLO" translatable="true">"Hello"</string>
-    <string name="LANDING_WELCOME" translatable="true">"Welcome to Genesis on mobile."</string>
-    <string name="LANDING_BROWSE_INFO" translatable="true">"Browse the internet how you expect you should."</string>
-    <string name="LANDING_NO_TRACKING" translatable="true">"No tracking. No censorship."</string>
-
-
     <!-- Application Strings -->
     <string name="mode" translatable="false">Day</string>
     <string name="app_name" translatable="false">Genesis</string>
@@ -48,6 +26,61 @@
     <string name="shortcut_open" translatable="false">Restart or Open</string>
     <string name="shortcut_open_long" translatable="false">Restart Application</string>
 
+    <!-- Bookmark Setting -->
+    <string name="BOOKMARK_SETTING_HEADER" translatable="true">Edit Bookmark</string>
+    <string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Bookmark Name</string>
+    <string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Name of bookmarked url will be shown here</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Enter bookmark name…</string>
+
+    <!-- Bookmark Alerts -->
+    <string name="HOME_MENU__BOOKMARK_REMOVED" translatable="true">Bookmark removed</string>
+    <string name="HOME_MENU__BOOKMARK_UPDATE" translatable="true">Bookmark updated</string>
+
+    <!-- Alerts General -->
+    <string name="ALERT_DISMISS" translatable="true">Dismiss</string>
+
+    <!-- Landing Page -->
+    <string name="LANDING_BRIDGES_INFO" translatable="true">"Sometimes you need a Bridge to get to Tor Network"</string>
+    <string name="LANDING_MORE" translatable="true">"TELL ME MORE"</string>
+    <string name="LANDING_HELLO" translatable="true">"Hello"</string>
+    <string name="LANDING_WELCOME" translatable="true">"Welcome to Genesis on mobile."</string>
+    <string name="LANDING_BROWSE_INFO" translatable="true">"Browse the internet how you expect you should."</string>
+    <string name="LANDING_NO_TRACKING" translatable="true">"No tracking. No censorship."</string>
+
+    <!-- Alert Secure -->
+    <string name="ALERT_SECURE" translatable="false">https://</string>
+    <string name="ALERT_SECURE_INFO_HEADER" translatable="false">onion:</string>
+    <string name="ALERT_SECURE_INFO_Header" translatable="false">onion:</string>
+    <string name="ALERT_SECURE_INFO" translatable="true">Connection is secure</string>
+    <string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Your information (for example, password or credit card numbers) is private when it is sent to this site</string>
+    <string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Privacy Settings</string>
+    <string name="ALERT_SECURE_INFO_JAVASCRIPT_HEADER" translatable="true">Javascript</string>
+    <string name="ALERT_SECURE_INFO_JAVASCRIPT_INFO" translatable="true">Keep your identity safe and use the options below</string>
+    <string name="ALERT_SECURE_INFO_NONTRACKING_HEADER" translatable="true">Do Not Track</string>
+    <string name="ALERT_SECURE_INFO_NONTRACKING_INFO" translatable="true">Genesis will tell sites that you do not want to be tracked</string>
+    <string name="ALERT_SECURE_INFO_TRACKING_HEADER" translatable="true">Tracking Protection</string>
+    <string name="ALERT_SECURE_INFO_TRACKING_INFO" translatable="true">Enable tracking protection provided by Genesis</string>
+    <string name="ALERT_SECURE_INFO_CERTIFICATE" translatable="true">Certificate</string>
+    <string name="ALERT_CERTIFICATE_HEADER" translatable="true">Certificate Information</string>
+
+    <!-- Orbot Log -->
+    <string name="ORBOT_LOG" translatable="true">Proxy Logs</string>
+    <string name="ORBOT_LOG_HEADER" translatable="true">Logs Info</string>
+    <string name="ORBOT_LOG_INFO" translatable="true">If you are facing connectivity issue while starting Genesis please copy the following code and find issue online or send it to us, so we can try to help you out </string>
+    <string name="ORBOT_LOADING_STATIC" translatable="true">~&#160;Genesis on standby at the moment</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
     <!-- Settings -->
     <string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
     <string name="SETTING_BASIC_SETTING" translatable="true">Basic Settings</string>
@@ -235,13 +268,10 @@
     <string name="ALERT_CLEAR_HISTORY_INFO" translatable="true">Clearing data will remove history, cookies, and other browsing data</string>
     <string name="ALERT_CLEAR_BOOKMARK_INFO" translatable="true">Remove all bookmarks ?</string>
     <string name="ALERT_CLEAR" translatable="true">Clear</string>
+    <string name="ALERT_IMAGE_STATUS" translatable="true">Restart required after changes</string>
     <string name="ALERT_CONFIRM" translatable="true">Confirm</string>
     <string name="ALERT_ADD" translatable="true">Done</string>
     <string name="ALERT_TITLE_ADD" translatable="true">bookmark name...</string>
-    <string name="ALERT_SECURE" translatable="false">https://</string>
-    <string name="ALERT_SECURE_INFO" translatable="true">Connection is secure</string>
-    <string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Your information(for example, password or credit card numbers) is private when it is sent to this site</string>
-    <string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Privacy Settings</string>
     <string name="ALERT_DOWNLOAD_SINGLE" translatable="true">Waiting to download ...</string>
     <string name="ALERT_DOWNLOAD_SINGLE_BUTTON" translatable="true">Download</string>
     <string name="ALERT_REPORT" translatable="true">Report</string>
@@ -254,6 +284,7 @@
     <string name="ALERT_RATE" translatable="true">Rate</string>
     <string name="ALERT_RATEUS_FAILURE_INFO" translatable="true"><b><font color='#00b3b3'>SORRY TO HEAR THAT ! &#160;</font></b>&#160;If you are having difficulty while using this application please reach out to us via email. We will try to solve your problem as soon as possible</string>
     <string name="ALERT_MAIL" translatable="true">Mail</string>
+    <string name="ALERT_RESTART" translatable="true">Restart</string>
     <string name="ALERT_BRIDGE_MAIL" translatable="true">Request New Bridge</string>
     <string name="ALERT_BRIDGE_MAIL_INFO" translatable="true"><b><font color='#00b3b3'>REQUEST BRIDGE &#160;</font></b>&#160;Select E-mail below to request a bridge address.\n\nOnce you have an address, copy &amp; paste it into the above box and start the application.</string>
     <string name="ALERT_LANGUAGE_SUPPORT_FAILURE" translatable="true">Language not supported</string>
@@ -323,11 +354,6 @@
     <string name="BRIDGE_OBFS4" translatable="true">obfs4 (Recommended)</string>
     <string name="BRIDGE_MEEK" translatable="true">Meek-azure (China)</string>
 
-    <!-- Orbot Log -->
-    <string name="ORBOT_LOG" translatable="true">Proxy Logs</string>
-    <string name="ORBOT_LOG_HEADER" translatable="true">Logs Info</string>
-    <string name="ORBOT_LOG_INFO" translatable="true">If you are facing connectivity issue while starting Genesis please copy the following code and find issue online or send it to us, so we can try to help you out </string>
-
     <!-- Popup Menu -->
     <string name="HOME_MENU__NEW_CIRCUIT" translatable="true">New identity</string>
     <string name="HOME_MENU__NEW_CIRCUIT_CREATED" translatable="true">New identity created</string>
@@ -427,7 +453,6 @@
     <string name="HOME_CONNECT" translatable="false">Connect</string>
     <string name="HOME_COPYRIGHT" translatable="false">Copyright © by Genesis Technologies | Built 1.0.2.2</string>
     <string name="HOME_LOADING" translatable="true">Idle | Genesis on standby at the moment</string>
-    <string name="HOME_LOADING_STATIC" translatable="true">~&#160;Genesis on standby at the moment</string>
     <string name="HOME_TAB_EMPTY" translatable="true">Open tabs will show here</string>
 
     <!-- Error Page -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d172e745..fd1e1da6 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -40,8 +40,8 @@
     </style>
 
     <style name="dialiog_animation">
-        <item name="android:windowEnterAnimation">@anim/popup_anim_in</item>
-        <item name="android:windowExitAnimation">@anim/popup_anim_out</item>
+        <item name="android:windowEnterAnimation">@anim/popup_scale_in_dialog</item>
+        <item name="android:windowExitAnimation">@anim/popup_scale_out_dialog</item>
     </style>
 
     <style name="noAnimTheme" parent="android:Theme">
diff --git a/app/variables.gradle b/app/variables.gradle
index 5d338028..1ffb19ff 100755
--- a/app/variables.gradle
+++ b/app/variables.gradle
@@ -1,6 +1,6 @@
 /* Version */
-project.ext.vname = 'Build | Dark-Origin 1.4.6.1'
-project.ext.vcode = 100
+project.ext.vname = 'Build | Dark-Origin 1.4.7.2'
+project.ext.vcode = 180
 project.ext.buildType = 'release'
 
 /* dimension */
diff --git a/gecko-settings.yaml b/gecko-settings.yaml
new file mode 100644
index 00000000..e69de29b
diff --git a/gradle.properties b/gradle.properties
index 89d49961..c212199b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,4 +2,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx5048M
+android.bundle.enableUncompressedNativeLibs=false
 
diff --git a/orbotmanager/build.gradle b/orbotmanager/build.gradle
index 8c83a6c0..a96ef159 100644
--- a/orbotmanager/build.gradle
+++ b/orbotmanager/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion '30.0.3'
     ndkVersion '21.3.6528147'
 
@@ -13,7 +13,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -51,7 +51,6 @@ dependencies {
     implementation 'com.gitlab.guardianproject:jsocksandroid:1.0.4'
 
     implementation 'com.jaredrummler:android-shell:1.0.0'
-    //implementation fileTree(dir: 'libs', include: ['.so','.aar'])
 
     implementation 'androidx.core:core:1.6.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
@@ -62,7 +61,7 @@ dependencies {
     implementation 'info.guardianproject:geoip:20191217'
 
     api 'info.guardianproject:jtorctl:0.4.5.7'
-    implementation 'info.guardianproject:tor-android:0.4.5.7'
+    implementation 'info.guardianproject:tor-android:0.4.5.9'
 
     implementation 'com.github.tladesignz:IPtProxy:1.0.0'
 }
diff --git a/orbotmanager/src/main/assets/fronts b/orbotmanager/src/main/assets/fronts
deleted file mode 100644
index fb357d84..00000000
--- a/orbotmanager/src/main/assets/fronts
+++ /dev/null
@@ -1,5 +0,0 @@
-snowflake https://d2kt284300pde7.cloudfront.net/
-snowflake-stun stun:stun.l.google.com:19302
-moat-cdn https://d50gd378qj74g.cloudfront.net/
-moat-url https://moat.torproject.org.global.prod.fastly.net/
-moat-front cdn.sstatic.net
\ No newline at end of file
diff --git a/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java b/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java
index 664607d2..681070f7 100644
--- a/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java
@@ -321,20 +321,16 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
             ex.printStackTrace();
         }
 
-        new Thread(){
-            public void run(){
-                try {
-                    isAppClosed = true;
+        isAppClosed = true;
 
-                    stopTor();
-                    stopTorAsync();
-                    clearNotifications();
-                    killAllDaemons();
-                } catch (Exception ex) {
-                    Log.i("", "");
-                }
-            }
-        }.start();
+        try {
+            stopTor();
+            stopTorAsync();
+            clearNotifications();
+            killAllDaemons();
+        } catch (Exception exception) {
+            exception.printStackTrace();
+        }
 
         super.onDestroy();
     }
@@ -958,6 +954,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
                                 Thread.sleep(500);
                                 conn = torService.getTorControlConnection();
                             }
+                            sleep(2000);
                             mEventHandler = new TorEventHandler(OrbotService.this);
                             logNotice("adding control port event handler");
                             conn.setEventHandler(mEventHandler);
@@ -1216,8 +1213,14 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
     }
 
     int e=0;
+    String mPrevLogs = "";
     private void sendCallbackLogMessage(String logMessage)
     {
+        if(mPrevLogs.equals(logMessage)){
+            return;
+        }else {
+            mPrevLogs = logMessage;
+        }
         if(logMessage.contains("Bootstrapped 100%")){
             orbotLocalConstants.mIsTorInitialized = true;
         }
diff --git a/orbotmanager/src/main/java/org/torproject/android/service/StartTorReceiver.java b/orbotmanager/src/main/java/org/torproject/android/service/StartTorReceiver.java
index 3fb77e91..943385c8 100644
--- a/orbotmanager/src/main/java/org/torproject/android/service/StartTorReceiver.java
+++ b/orbotmanager/src/main/java/org/torproject/android/service/StartTorReceiver.java
@@ -14,7 +14,7 @@ public class StartTorReceiver extends BroadcastReceiver implements TorServiceCon
     @Override
     public void onReceive(Context context, Intent intent) {
         /* sanitize the Intent before forwarding it to OrbotService */
-        Prefs.setContext(context);
+        /*Prefs.setContext(context);
         String action = intent.getAction();
         if (TextUtils.equals(action, ACTION_START)) {
             String packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME);
@@ -37,6 +37,6 @@ public class StartTorReceiver extends BroadcastReceiver implements TorServiceCon
                 startsDisabledIntent.setPackage(packageName);
                 context.sendBroadcast(startsDisabledIntent);
             }
-        }
+        }*/
     }
 }
diff --git a/orbotmanager/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotmanager/src/main/java/org/torproject/android/service/TorEventHandler.java
index 3fcbb17b..6bfa118a 100644
--- a/orbotmanager/src/main/java/org/torproject/android/service/TorEventHandler.java
+++ b/orbotmanager/src/main/java/org/torproject/android/service/TorEventHandler.java
@@ -83,10 +83,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants {
 
         if (lastWritten > BW_THRESDHOLD || lastRead > BW_THRESDHOLD) {
 
-            int iconId = R.drawable.ic_stat_starting_tor_logo;
-
-            if (read > 0 || written > 0)
-                iconId = R.mipmap.ic_stat_tor_logo;
+            int iconId = R.mipmap.ic_stat_tor_logo;
 
             String sb = OrbotService.formatBandwidthCount(mService, read) + " \u2193" + " / " +
                     OrbotService.formatBandwidthCount(mService, written) + " \u2191";
diff --git a/orbotmanager/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotmanager/src/main/java/org/torproject/android/service/util/Prefs.java
index eaec24e5..f40dcb62 100644
--- a/orbotmanager/src/main/java/org/torproject/android/service/util/Prefs.java
+++ b/orbotmanager/src/main/java/org/torproject/android/service/util/Prefs.java
@@ -95,7 +95,7 @@ public class Prefs {
     }
 
     public static boolean useDebugLogging() {
-        return prefs.getBoolean(PREF_ENABLE_LOGGING, false);
+        return false;
     }
 
     public static boolean persistNotifications() {
diff --git a/orbotmanager/src/main/libs/arm64-v8a/libtun2socks.so b/orbotmanager/src/main/libs/arm64-v8a/libtun2socks.so
index d70b672d..e045af10 100644
Binary files a/orbotmanager/src/main/libs/arm64-v8a/libtun2socks.so and b/orbotmanager/src/main/libs/arm64-v8a/libtun2socks.so differ
diff --git a/orbotmanager/src/main/libs/arm64-v8a/pdnsd b/orbotmanager/src/main/libs/arm64-v8a/pdnsd
new file mode 100644
index 00000000..526f2f22
Binary files /dev/null and b/orbotmanager/src/main/libs/arm64-v8a/pdnsd differ
diff --git a/orbotmanager/src/main/libs/arm64-v8a/pdnsd.so b/orbotmanager/src/main/libs/arm64-v8a/pdnsd.so
deleted file mode 100644
index 4b089800..00000000
Binary files a/orbotmanager/src/main/libs/arm64-v8a/pdnsd.so and /dev/null differ
diff --git a/orbotmanager/src/main/libs/armeabi-v7a/libtun2socks.so b/orbotmanager/src/main/libs/armeabi-v7a/libtun2socks.so
index ee85adc5..314973bc 100644
Binary files a/orbotmanager/src/main/libs/armeabi-v7a/libtun2socks.so and b/orbotmanager/src/main/libs/armeabi-v7a/libtun2socks.so differ
diff --git a/orbotmanager/src/main/libs/armeabi-v7a/pdnsd.so b/orbotmanager/src/main/libs/armeabi-v7a/pdnsd.so
index 9168d682..4fbb89b9 100644
Binary files a/orbotmanager/src/main/libs/armeabi-v7a/pdnsd.so and b/orbotmanager/src/main/libs/armeabi-v7a/pdnsd.so differ
diff --git a/orbotmanager/src/main/libs/x86/libtun2socks.so b/orbotmanager/src/main/libs/x86/libtun2socks.so
index 264dceaa..eafe2f87 100644
Binary files a/orbotmanager/src/main/libs/x86/libtun2socks.so and b/orbotmanager/src/main/libs/x86/libtun2socks.so differ
diff --git a/orbotmanager/src/main/libs/x86/pdnsd b/orbotmanager/src/main/libs/x86/pdnsd
new file mode 100644
index 00000000..933a2774
Binary files /dev/null and b/orbotmanager/src/main/libs/x86/pdnsd differ
diff --git a/orbotmanager/src/main/libs/x86/pdnsd.so b/orbotmanager/src/main/libs/x86/pdnsd.so
deleted file mode 100644
index 7724b3d0..00000000
Binary files a/orbotmanager/src/main/libs/x86/pdnsd.so and /dev/null differ
diff --git a/orbotmanager/src/main/libs/x86_64/libtun2socks.so b/orbotmanager/src/main/libs/x86_64/libtun2socks.so
index bc35ee49..73719868 100644
Binary files a/orbotmanager/src/main/libs/x86_64/libtun2socks.so and b/orbotmanager/src/main/libs/x86_64/libtun2socks.so differ
diff --git a/orbotmanager/src/main/libs/x86_64/pdnsd b/orbotmanager/src/main/libs/x86_64/pdnsd
new file mode 100644
index 00000000..61662d6c
Binary files /dev/null and b/orbotmanager/src/main/libs/x86_64/pdnsd differ
diff --git a/orbotmanager/src/main/libs/x86_64/pdnsd.so b/orbotmanager/src/main/libs/x86_64/pdnsd.so
deleted file mode 100644
index 094ed123..00000000
Binary files a/orbotmanager/src/main/libs/x86_64/pdnsd.so and /dev/null differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/libancillary.a b/orbotmanager/src/main/obj/local/arm64-v8a/libancillary.a
index e2571a0f..bd209be4 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/libancillary.a and b/orbotmanager/src/main/obj/local/arm64-v8a/libancillary.a differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/libtun2socks.so b/orbotmanager/src/main/obj/local/arm64-v8a/libtun2socks.so
index 85c5cc3f..e53ed408 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/libtun2socks.so and b/orbotmanager/src/main/obj/local/arm64-v8a/libtun2socks.so differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_recv.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_recv.o
index e6270c0f..9971d620 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_recv.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_recv.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_recv.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_recv.o.d
index 43b17a01..541b5cc0 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_recv.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_recv.o.d
@@ -1,4 +1,4 @@
 ./obj/local/arm64-v8a/objs/ancillary/libancillary/fd_recv.o: \
-  jni/libancillary/fd_recv.c jni/libancillary/ancillary.h
+  jni\libancillary\fd_recv.c jni\libancillary\ancillary.h
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_send.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_send.o
index 3600369e..6b4ac312 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_send.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_send.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_send.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_send.o.d
index 4e636ae2..7a91f7cc 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_send.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/ancillary/libancillary/fd_send.o.d
@@ -1,4 +1,4 @@
 ./obj/local/arm64-v8a/objs/ancillary/libancillary/fd_send.o: \
-  jni/libancillary/fd_send.c jni/libancillary/ancillary.h
+  jni\libancillary\fd_send.c jni\libancillary\ancillary.h
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/cache.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/cache.o
index 2e87b39d..002d5e36 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/cache.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/cache.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/cache.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/cache.o.d
index 7d96338d..e12eece9 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/cache.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/cache.o.d
@@ -1,32 +1,32 @@
-./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/cache.o: jni/pdnsd/src/cache.c \
-  jni/pdnsd/config.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/hash.h jni/pdnsd/src/helpers.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/thread.h jni/pdnsd/src/debug.h
+./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/cache.o: jni\pdnsd\src\cache.c \
+  jni\pdnsd\config.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\hash.h jni\pdnsd\src\helpers.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\thread.h jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conf-parser.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conf-parser.o
index 96b795ae..a14535fd 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conf-parser.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conf-parser.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conf-parser.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conf-parser.o.d
index bb832a92..96f84de9 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conf-parser.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conf-parser.o.d
@@ -1,33 +1,33 @@
 ./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conf-parser.o: \
-  jni/pdnsd/src/conf-parser.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/conff.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/conf-keywords.h \
-  jni/pdnsd/src/conf-parser.h
+  jni\pdnsd\src\conf-parser.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\conff.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\conf-keywords.h \
+  jni\pdnsd\src\conf-parser.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/conf-keywords.h:
+jni\pdnsd\src\conf-keywords.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conff.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conff.o
index 2e431647..e6e6304e 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conff.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conff.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conff.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conff.o.d
index b2335643..b99bdf49 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conff.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conff.o.d
@@ -1,33 +1,33 @@
-./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conff.o: jni/pdnsd/src/conff.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/conff.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conf-parser.h jni/pdnsd/src/servers.h \
-  jni/pdnsd/src/icmp.h
+./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/conff.o: jni\pdnsd\src\conff.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\conff.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conf-parser.h jni\pdnsd\src\servers.h \
+  jni\pdnsd\src\icmp.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/consts.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/consts.o
index 119adb6f..7f1734fd 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/consts.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/consts.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/consts.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/consts.o.d
index 03a6337a..04384e15 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/consts.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/consts.o.d
@@ -1,9 +1,9 @@
 ./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/consts.o: \
-  jni/pdnsd/src/consts.c jni/pdnsd/config.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/rr_types.h
+  jni\pdnsd\src\consts.c jni\pdnsd\config.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\rr_types.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/debug.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/debug.o
index 9f7f6632..c0e69725 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/debug.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/debug.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/debug.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/debug.o.d
index f9c8d4c7..85187446 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/debug.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/debug.o.d
@@ -1,27 +1,27 @@
-./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/debug.o: jni/pdnsd/src/debug.c \
-  jni/pdnsd/config.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h
+./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/debug.o: jni\pdnsd\src\debug.c \
+  jni\pdnsd\config.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns.o
index 2cad7986..bf2b7611 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns.o.d
index d1af935b..60b8a16b 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns.o.d
@@ -1,27 +1,27 @@
-./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns.o: jni/pdnsd/src/dns.c \
-  jni/pdnsd/config.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns.o: jni\pdnsd\src\dns.c \
+  jni\pdnsd\config.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_answer.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_answer.o
index a6758b29..e6507450 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_answer.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_answer.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_answer.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_answer.o.d
index c0014eeb..c39d3d23 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_answer.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_answer.o.d
@@ -1,35 +1,35 @@
 ./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_answer.o: \
-  jni/pdnsd/src/dns_answer.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/thread.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/dns_answer.h jni/pdnsd/src/dns_query.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/conff.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/debug.h
+  jni\pdnsd\src\dns_answer.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\thread.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\dns_answer.h jni\pdnsd\src\dns_query.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\conff.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_query.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_query.o
index 8d12bccc..f830eeee 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_query.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_query.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_query.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_query.o.d
index 4dce4a25..fd71ead4 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_query.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_query.o.d
@@ -1,40 +1,40 @@
 ./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/dns_query.o: \
-  jni/pdnsd/src/dns_query.c jni/pdnsd/config.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/dns_query.h jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conff.h jni/pdnsd/src/servers.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/debug.h
+  jni\pdnsd\src\dns_query.c jni\pdnsd\config.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\dns_query.h jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conff.h jni\pdnsd\src\servers.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/error.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/error.o
index 1dcd8874..40f78718 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/error.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/error.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/error.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/error.o.d
index f86b965d..2f16d360 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/error.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/error.o.d
@@ -1,27 +1,27 @@
-./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/error.o: jni/pdnsd/src/error.c \
-  jni/pdnsd/config.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/error.o: jni\pdnsd\src\error.c \
+  jni\pdnsd\config.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/hash.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/hash.o
index 1bf32d38..1bacea11 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/hash.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/hash.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/hash.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/hash.o.d
index 1c134115..a12274ca 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/hash.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/hash.o.d
@@ -1,32 +1,32 @@
-./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/hash.o: jni/pdnsd/src/hash.c \
-  jni/pdnsd/config.h jni/pdnsd/src/hash.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/consts.h
+./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/hash.o: jni\pdnsd\src\hash.c \
+  jni\pdnsd\config.h jni\pdnsd\src\hash.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\consts.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/helpers.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/helpers.o
index bf203127..f278cd6e 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/helpers.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/helpers.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/helpers.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/helpers.o.d
index 18cb3b96..45f95384 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/helpers.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/helpers.o.d
@@ -1,27 +1,27 @@
 ./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/helpers.o: \
-  jni/pdnsd/src/helpers.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/thread.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+  jni\pdnsd\src\helpers.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\thread.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/icmp.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/icmp.o
index 71df151a..8bf6e200 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/icmp.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/icmp.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/icmp.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/icmp.o.d
index 6f09489d..858c6d1e 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/icmp.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/icmp.o.d
@@ -1,34 +1,34 @@
-./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/icmp.o: jni/pdnsd/src/icmp.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/icmp.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/servers.h jni/pdnsd/src/consts.h
+./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/icmp.o: jni\pdnsd\src\icmp.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\icmp.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\servers.h jni\pdnsd\src\consts.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/list.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/list.o
index 2ad2383f..44875010 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/list.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/list.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/list.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/list.o.d
index 23b6eb28..096bb3dd 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/list.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/list.o.d
@@ -1,27 +1,27 @@
-./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/list.o: jni/pdnsd/src/list.c \
-  jni/pdnsd/config.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h
+./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/list.o: jni\pdnsd\src\list.c \
+  jni\pdnsd\config.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/main.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/main.o
index 05db329d..2377cb95 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/main.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/main.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/main.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/main.o.d
index 9fe63974..5f47aed6 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/main.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/main.o.d
@@ -1,44 +1,44 @@
-./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/main.o: jni/pdnsd/src/main.c \
-  jni/pdnsd/config.h jni/pdnsd/src/consts.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/status.h jni/pdnsd/src/servers.h \
-  jni/pdnsd/src/dns_answer.h jni/pdnsd/src/dns_query.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/icmp.h jni/pdnsd/src/hash.h
+./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/main.o: jni\pdnsd\src\main.c \
+  jni\pdnsd\config.h jni\pdnsd\src\consts.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\status.h jni\pdnsd\src\servers.h \
+  jni\pdnsd\src\dns_answer.h jni\pdnsd\src\dns_query.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\icmp.h jni\pdnsd\src\hash.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/status.h:
+jni\pdnsd\src\status.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/netdev.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/netdev.o
index 483bb671..fefb4f2b 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/netdev.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/netdev.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/netdev.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/netdev.o.d
index 23934bf4..7c7efd63 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/netdev.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/netdev.o.d
@@ -1,30 +1,30 @@
 ./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/netdev.o: \
-  jni/pdnsd/src/netdev.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/list.h jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conff.h jni/pdnsd/src/netdev.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/thread.h
+  jni\pdnsd\src\netdev.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\list.h jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conff.h jni\pdnsd\src\netdev.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/rr_types.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/rr_types.o
index 1326c95d..45ab626b 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/rr_types.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/rr_types.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/rr_types.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/rr_types.o.d
index 24cfd94d..82b5a682 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/rr_types.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/rr_types.o.d
@@ -1,23 +1,23 @@
 ./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/rr_types.o: \
-  jni/pdnsd/src/rr_types.c jni/pdnsd/config.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/list.h jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conff.h
+  jni\pdnsd\src\rr_types.c jni\pdnsd\config.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\list.h jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/servers.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/servers.o
index 44aafb5a..68162e49 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/servers.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/servers.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/servers.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/servers.o.d
index 5029b3e3..d8705670 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/servers.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/servers.o.d
@@ -1,39 +1,39 @@
 ./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/servers.o: \
-  jni/pdnsd/src/servers.c jni/pdnsd/config.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/servers.h jni/pdnsd/src/consts.h jni/pdnsd/src/icmp.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/dns_query.h
+  jni\pdnsd\src\servers.c jni\pdnsd\config.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\servers.h jni\pdnsd\src\consts.h jni\pdnsd\src\icmp.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\dns_query.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/status.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/status.o
index 80e220ae..8fb5e930 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/status.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/status.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/status.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/status.o.d
index 0afca63a..ae433e65 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/status.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/status.o.d
@@ -1,40 +1,40 @@
 ./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/status.o: \
-  jni/pdnsd/src/status.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/status.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/list.h jni/pdnsd/src/pdnsd_assert.h \
-  jni/pdnsd/src/thread.h jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/helpers.h jni/pdnsd/src/servers.h \
-  jni/pdnsd/src/consts.h jni/pdnsd/src/dns_answer.h \
-  jni/pdnsd/src/conf-parser.h
+  jni\pdnsd\src\status.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\status.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\list.h jni\pdnsd\src\pdnsd_assert.h \
+  jni\pdnsd\src\thread.h jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\helpers.h jni\pdnsd\src\servers.h \
+  jni\pdnsd\src\consts.h jni\pdnsd\src\dns_answer.h \
+  jni\pdnsd\src\conf-parser.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/status.h:
+jni\pdnsd\src\status.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/thread.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/thread.o
index cbac9f21..eede52c9 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/thread.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/thread.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/thread.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/thread.o.d
index 372166d9..76e13d9b 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/thread.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/thread.o.d
@@ -1,27 +1,27 @@
 ./obj/local/arm64-v8a/objs/pdnsd/pdnsd/src/thread.o: \
-  jni/pdnsd/src/thread.c jni/pdnsd/config.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+  jni\pdnsd\src\thread.c jni\pdnsd\config.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o
index 2990351f..a3750668 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
index bb8a2147..62dde761 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
@@ -1,23 +1,23 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o: \
-  jni/../../../../external/badvpn/base/BLog.c \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channels_list.h
+  jni\..\..\..\..\external\badvpn\base\BLog.c \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_list.h
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_list.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_list.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o
index 74c90cba..f3aaa8e4 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
index bfa1bc8d..ee972fae 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
@@ -1,23 +1,23 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o: \
-  jni/../../../../external/badvpn/base/BLog_syslog.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog_syslog.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog_syslog.h:
+jni\..\..\..\..\external\badvpn\base\BLog_syslog.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o
index 69fd10e4..9fefbf15 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
index 2aace2c2..d2bf27e3 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
@@ -1,38 +1,38 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o: \
-  jni/../../../../external/badvpn/base/BPending.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_impl.h
+  jni\..\..\..\..\external\badvpn\base\BPending.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_impl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_impl.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o
index 1894e658..c68ebd65 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
index bc6cd2f1..db65fcac 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
@@ -1,11 +1,11 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o: \
-  jni/../../../../external/badvpn/base/DebugObject.c \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h
+  jni\..\..\..\..\external\badvpn\base\DebugObject.c \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o
index 0b445a3a..a5a7d880 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
index 2c37c159..593ea838 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
@@ -1,38 +1,38 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o: \
-  jni/../../../../external/badvpn/flow/BufferWriter.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o
index 68cc1bd6..803c2c56 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
index cc09f810..41b4155f 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
@@ -1,56 +1,56 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o: \
-  jni/../../../../external/badvpn/flow/PacketBuffer.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o
index 47f5d228..cc11b5a8 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
index d450a971..a6f8020b 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
@@ -1,38 +1,38 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o: \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o
index 5b5226ce..79a9f847 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
index c1cd2ef1..0a1feb81 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
@@ -1,86 +1,86 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o: \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_impl.h \
-  jni/../../../../external/badvpn/structure/CAvl_impl.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_impl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_impl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o
index 7bc6188f..2321d40a 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
index a910066a..a3b69941 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o: \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.c \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o
index bdf1abdc..8b06f791 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
index afb8b883..2ef7e580 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
@@ -1,65 +1,65 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_PacketProtoDecoder.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_PacketProtoDecoder.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_PacketProtoDecoder.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o
index 61c1234f..803eb4bf 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
index 0135a653..0cdc550f 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
@@ -1,50 +1,50 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.c \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.c \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o
index 115e167c..7a952089 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
index de74fe3f..a79aa771 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
@@ -1,62 +1,62 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.c \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.c \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o
index 9cb6a812..fbf08b0f 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
index a4095304..9d2b9f81 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o: \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.c \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o
index 148e2163..9aa3d4bd 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
index a66f663b..12b00676 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
@@ -1,41 +1,41 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o: \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o
index 541aec26..666ae940 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
index 4d3538de..797c85fe 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
@@ -1,50 +1,50 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o: \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/flow/SinglePacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o
index 4a419a14..d8739751 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
index 45eb74c9..86fb7bb3 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o: \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.c \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o
index 0ccd8733..bf240d6f 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
index 552f3531..72169291 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o: \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.c \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o
index 65e06fcc..debf7b53 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
index a6d3fb33..9c450a54 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
@@ -1,80 +1,80 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o: \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.c \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.c \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o
index a0f6d371..14adb822 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
index f0a67d4d..c204ac1d 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
@@ -1,56 +1,56 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o: \
-  jni/../../../../external/badvpn/lwip/custom/sys.c \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h
+  jni\..\..\..\..\external\badvpn\lwip\custom\sys.c \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o
index 175da082..b051eff9 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
index 75ff1808..922dc527 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
@@ -1,47 +1,47 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o: \
-  jni/../../../../external/badvpn/lwip/src/core/def.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\def.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o
index 21e8b1b9..0d179171 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
index fd9b017e..5df51477 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
@@ -1,65 +1,65 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o: \
-  jni/../../../../external/badvpn/lwip/src/core/inet_chksum.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\inet_chksum.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o
index 9b176227..58948b4e 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
index 5b5b60a6..a59cdc6a 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
@@ -1,146 +1,146 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o: \
-  jni/../../../../external/badvpn/lwip/src/core/init.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/init.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sockets.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\init.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sockets.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/init.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sockets.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sockets.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o
index 648cc2d7..2458e03b 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
index f4cc8d50..8cd77596 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
@@ -1,44 +1,44 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/autoip.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\autoip.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o
index 87dd6f5f..c5e05eaf 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
index a0386932..0fc2ab83 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
@@ -1,98 +1,98 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/icmp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\icmp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o
index 9967ec9b..f19769f0 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
index 653f4526..5a41a540 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
@@ -1,44 +1,44 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/igmp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\igmp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o
index 6393e4a2..1d7afe57 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
index 61721acd..8e75b809 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
@@ -1,125 +1,125 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip4.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip4.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o
index 3cf10169..80e0fa17 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
index 39221d25..67191248 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
@@ -1,65 +1,65 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip4_addr.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip4_addr.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o
index a00f3974..b4631b06 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
index 4185a17c..77483352 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
@@ -1,101 +1,101 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip_frag.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip_frag.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o
index cc7d52a5..3b638d4b 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
index 8ed88b6e..3d00dff8 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/dhcp6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\dhcp6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o
index ad2d2380..35355a6f 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
index 69ecfa62..3a8ec742 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ethip6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ethip6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o
index 4e6397a1..bcdb764e 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
index dd96aca2..8e8b9a45 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
@@ -1,98 +1,98 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/icmp6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\icmp6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o
index 25ac0151..5ec7a34c 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
index b224979e..f846d8ba 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/inet6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\inet6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o
index b09de572..e8884f0a 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
index 6711a9ea..6e91919f 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
@@ -1,116 +1,116 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\dhcp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\dhcp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o
index b2c61fdf..f7f3d45c 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
index ed6ca696..9bdddafc 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
@@ -1,50 +1,50 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6_addr.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6_addr.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o
index 9fe247de..a7cd2709 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
index c7310e42..810812b8 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
@@ -1,95 +1,95 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6_frag.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6_frag.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o
index 6e62d74e..3d14c875 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
index 310290f8..f3154d5f 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/mld6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\mld6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o
index faa816ae..596193c8 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
index 17142351..3eb66c7e 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
@@ -1,98 +1,98 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/nd6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\nd6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o
index dd71f148..d02ffe02 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
index ad8e1b57..6899ffec 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
@@ -1,44 +1,44 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o: \
-  jni/../../../../external/badvpn/lwip/src/core/mem.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\mem.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o
index 318e5695..a692ef98 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
index 212dc662..dedc77d2 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
@@ -1,152 +1,152 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/memp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/ppp_oe.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\memp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\ppp_oe.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/ppp_oe.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\ppp_oe.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o
index c0d0190d..7414759f 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
index a94d96ec..e04b75df 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
@@ -1,107 +1,107 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o: \
-  jni/../../../../external/badvpn/lwip/src/core/netif.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\netif.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o
index 80bbd894..8b4fa284 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
index dc946258..e034d180 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
@@ -1,104 +1,104 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o: \
-  jni/../../../../external/badvpn/lwip/src/core/pbuf.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\pbuf.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o
index 9156ff9f..7f47e0b9 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
index 62579451..8694bc4e 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
@@ -1,59 +1,59 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o: \
-  jni/../../../../external/badvpn/lwip/src/core/stats.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\stats.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o
index deeb7f41..50719b0e 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
index 78c193ee..4433422e 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
@@ -1,104 +1,104 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o
index 0a038e9c..15c18fe4 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
index 6232fd9c..fbcc7d2a 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
@@ -1,110 +1,110 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp_in.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp_in.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o
index 3ebb06e1..9c896180 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
index 7bddabe5..104e083a 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
@@ -1,104 +1,104 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp_out.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp_out.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o
index 1f8185f5..71cc0117 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
index 5f24970e..529c2e7d 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
@@ -1,131 +1,131 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o: \
-  jni/../../../../external/badvpn/lwip/src/core/timers.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\timers.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o
index 6ad97844..a6cf67bf 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
index ac327952..70a7e448 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
@@ -1,44 +1,44 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/udp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\udp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o
index 9112b795..c4d25a1c 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
index d23a8fdb..766cc69a 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
@@ -1,134 +1,134 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o: \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.c \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BSocksClient.h
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.c \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BSocksClient.h
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BSocksClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BSocksClient.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o
index adf9f28e..3fa39b6f 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
index f8f1e999..0c41b40f 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
@@ -1,116 +1,116 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o: \
-  jni/../../../../external/badvpn/system/BConnection_unix.c \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/misc/strdup.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BConnection.h
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.c \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\misc\strdup.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BConnection.h
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/misc/strdup.h:
+jni\..\..\..\..\external\badvpn\misc\strdup.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BConnection.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BConnection.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o
index 1227ded9..c602e822 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
index 41d8dfff..484684c9 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
@@ -1,113 +1,113 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o: \
-  jni/../../../../external/badvpn/system/BDatagram_unix.c \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BDatagram.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BDatagram_unix.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BDatagram.h
+  jni\..\..\..\..\external\badvpn\system\BDatagram_unix.c \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BDatagram.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BDatagram_unix.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BDatagram.h
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BDatagram.h:
+jni\..\..\..\..\external\badvpn\system\BDatagram.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BDatagram_unix.h:
+jni\..\..\..\..\external\badvpn\system\BDatagram_unix.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BDatagram.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BDatagram.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o
index 6ac750d4..1f13085d 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
index 159ef57f..639fcf52 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
@@ -1,26 +1,26 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o: \
-  jni/../../../../external/badvpn/system/BNetwork.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BNetwork.h
+  jni\..\..\..\..\external\badvpn\system\BNetwork.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BNetwork.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BNetwork.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BNetwork.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o
index e6352d49..91dab487 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
index 5040c06e..4b874e7e 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
@@ -1,95 +1,95 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o: \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BReactor.h \
-  jni/../../../../external/badvpn/structure/CAvl_impl.h
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BReactor.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BReactor.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BReactor.h:
 
-jni/../../../../external/badvpn/structure/CAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o
index 6e6af96e..a372f4fc 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
index d488feeb..acc60385 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
@@ -1,83 +1,83 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o: \
-  jni/../../../../external/badvpn/system/BSignal.c \
-  jni/../../../../external/badvpn/system/BUnixSignal.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BSignal.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BSignal.h
+  jni\..\..\..\..\external\badvpn\system\BSignal.c \
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BSignal.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BSignal.h
 
-jni/../../../../external/badvpn/system/BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\system\BUnixSignal.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BSignal.h:
+jni\..\..\..\..\external\badvpn\system\BSignal.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BSignal.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BSignal.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o
index 5fcac0ab..8e4ec1fe 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
index 96fd9ee4..02009884 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
@@ -1,29 +1,29 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o: \
-  jni/../../../../external/badvpn/system/BTime.c \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h
+  jni\..\..\..\..\external\badvpn\system\BTime.c \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o
index 86d9af14..161a3718 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
index dc1ef1e4..2a7822c7 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
@@ -1,92 +1,92 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o: \
-  jni/../../../../external/badvpn/system/BUnixSignal.c \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BUnixSignal.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BUnixSignal.h
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.c \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BUnixSignal.h
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\system\BUnixSignal.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BUnixSignal.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o
index 69c81497..7a2a86fb 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
index 7fa5b9c8..104b6ed7 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
@@ -1,194 +1,194 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o: \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/generated/blog_channel_SocksUdpGwClient.h
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_SocksUdpGwClient.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_SocksUdpGwClient.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o
index fd1c2467..0fff1c6a 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
index 10034f1c..d7a934c0 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
@@ -1,329 +1,329 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o: \
-  jni/../../../../external/badvpn/tun2socks/tun2socks.c \
-  jni/../../../../external/badvpn/misc/version.h \
-  jni/../../../../external/badvpn/misc/loggers_string.h \
-  jni/../../../../external/badvpn/misc/loglevel.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/dead.h \
-  jni/../../../../external/badvpn/misc/ipv4_proto.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/ipv6_proto.h \
-  jni/../../../../external/badvpn/misc/udp_proto.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/open_standard_streams.h \
-  jni/../../../../external/badvpn/misc/read_file.h \
-  jni/../../../../external/badvpn/misc/ipaddr6.h \
-  jni/../../../../external/badvpn/misc/parse_number.h \
-  jni/../../../../external/badvpn/misc/cstring.h \
-  jni/../../../../external/badvpn/misc/find_char.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/concat_strings.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BSignal.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/tuntap/BTap.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/init.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/base/BLog_syslog.h \
-  jni/../../../../external/badvpn/tun2socks/tun2socks.h \
-  jni/../../../../external/badvpn/generated/blog_channel_tun2socks.h \
-  jni/libancillary/ancillary.h
+  jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.c \
+  jni\..\..\..\..\external\badvpn\misc\version.h \
+  jni\..\..\..\..\external\badvpn\misc\loggers_string.h \
+  jni\..\..\..\..\external\badvpn\misc\loglevel.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\dead.h \
+  jni\..\..\..\..\external\badvpn\misc\ipv4_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\ipv6_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\udp_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\open_standard_streams.h \
+  jni\..\..\..\..\external\badvpn\misc\read_file.h \
+  jni\..\..\..\..\external\badvpn\misc\ipaddr6.h \
+  jni\..\..\..\..\external\badvpn\misc\parse_number.h \
+  jni\..\..\..\..\external\badvpn\misc\cstring.h \
+  jni\..\..\..\..\external\badvpn\misc\find_char.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\concat_strings.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BSignal.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_tun2socks.h \
+  jni\libancillary\ancillary.h
 
-jni/../../../../external/badvpn/misc/version.h:
+jni\..\..\..\..\external\badvpn\misc\version.h:
 
-jni/../../../../external/badvpn/misc/loggers_string.h:
+jni\..\..\..\..\external\badvpn\misc\loggers_string.h:
 
-jni/../../../../external/badvpn/misc/loglevel.h:
+jni\..\..\..\..\external\badvpn\misc\loglevel.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/dead.h:
+jni\..\..\..\..\external\badvpn\misc\dead.h:
 
-jni/../../../../external/badvpn/misc/ipv4_proto.h:
+jni\..\..\..\..\external\badvpn\misc\ipv4_proto.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/ipv6_proto.h:
+jni\..\..\..\..\external\badvpn\misc\ipv6_proto.h:
 
-jni/../../../../external/badvpn/misc/udp_proto.h:
+jni\..\..\..\..\external\badvpn\misc\udp_proto.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/open_standard_streams.h:
+jni\..\..\..\..\external\badvpn\misc\open_standard_streams.h:
 
-jni/../../../../external/badvpn/misc/read_file.h:
+jni\..\..\..\..\external\badvpn\misc\read_file.h:
 
-jni/../../../../external/badvpn/misc/ipaddr6.h:
+jni\..\..\..\..\external\badvpn\misc\ipaddr6.h:
 
-jni/../../../../external/badvpn/misc/parse_number.h:
+jni\..\..\..\..\external\badvpn\misc\parse_number.h:
 
-jni/../../../../external/badvpn/misc/cstring.h:
+jni\..\..\..\..\external\badvpn\misc\cstring.h:
 
-jni/../../../../external/badvpn/misc/find_char.h:
+jni\..\..\..\..\external\badvpn\misc\find_char.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/concat_strings.h:
+jni\..\..\..\..\external\badvpn\misc\concat_strings.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BSignal.h:
+jni\..\..\..\..\external\badvpn\system\BSignal.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/flow/SinglePacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/tuntap/BTap.h:
+jni\..\..\..\..\external\badvpn\tuntap\BTap.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/init.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/base/BLog_syslog.h:
+jni\..\..\..\..\external\badvpn\base\BLog_syslog.h:
 
-jni/../../../../external/badvpn/tun2socks/tun2socks.h:
+jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_tun2socks.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_tun2socks.h:
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o
index c4eca82b..4cf78155 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
index 8dfb321a..f0093a1f 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
@@ -1,86 +1,86 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o: \
-  jni/../../../../external/badvpn/tuntap/BTap.c \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/tuntap/BTap.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTap.h
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.c \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTap.h
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/tuntap/BTap.h:
+jni\..\..\..\..\external\badvpn\tuntap\BTap.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTap.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTap.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o
index 7d455b4e..79b9755b 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o and b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o differ
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
index dabaf2ba..7c23b42d 100644
--- a/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
+++ b/orbotmanager/src/main/obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
@@ -1,176 +1,176 @@
 ./obj/local/arm64-v8a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o: \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.c \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/generated/blog_channel_UdpGwClient.h
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.c \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_UdpGwClient.h
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_UdpGwClient.h:
diff --git a/orbotmanager/src/main/obj/local/arm64-v8a/pdnsd b/orbotmanager/src/main/obj/local/arm64-v8a/pdnsd
index b0e5472c..b2440dbe 100644
Binary files a/orbotmanager/src/main/obj/local/arm64-v8a/pdnsd and b/orbotmanager/src/main/obj/local/arm64-v8a/pdnsd differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/libancillary.a b/orbotmanager/src/main/obj/local/armeabi-v7a/libancillary.a
index 73c16fc8..1ba610cd 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/libancillary.a and b/orbotmanager/src/main/obj/local/armeabi-v7a/libancillary.a differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/libtun2socks.so b/orbotmanager/src/main/obj/local/armeabi-v7a/libtun2socks.so
index 43d854ea..660c4972 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/libtun2socks.so and b/orbotmanager/src/main/obj/local/armeabi-v7a/libtun2socks.so differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_recv.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_recv.o
index 9f9823d5..88a8b2f5 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_recv.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_recv.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_recv.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_recv.o.d
index 5403104d..c1a72557 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_recv.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_recv.o.d
@@ -1,4 +1,4 @@
 ./obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_recv.o: \
-  jni/libancillary/fd_recv.c jni/libancillary/ancillary.h
+  jni\libancillary\fd_recv.c jni\libancillary\ancillary.h
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_send.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_send.o
index afcb750e..ec56f866 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_send.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_send.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_send.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_send.o.d
index 4b2df1b1..cbd63a45 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_send.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_send.o.d
@@ -1,4 +1,4 @@
 ./obj/local/armeabi-v7a/objs/ancillary/libancillary/fd_send.o: \
-  jni/libancillary/fd_send.c jni/libancillary/ancillary.h
+  jni\libancillary\fd_send.c jni\libancillary\ancillary.h
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/cache.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/cache.o
index 5457b0c8..fff17deb 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/cache.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/cache.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/cache.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/cache.o.d
index 82f98a74..654ecc66 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/cache.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/cache.o.d
@@ -1,32 +1,32 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/cache.o: \
-  jni/pdnsd/src/cache.c jni/pdnsd/config.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/hash.h jni/pdnsd/src/helpers.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/thread.h jni/pdnsd/src/debug.h
+  jni\pdnsd\src\cache.c jni\pdnsd\config.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\hash.h jni\pdnsd\src\helpers.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\thread.h jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conf-parser.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conf-parser.o
index 7c953583..ce23e52a 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conf-parser.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conf-parser.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conf-parser.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conf-parser.o.d
index f0499df0..11478727 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conf-parser.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conf-parser.o.d
@@ -1,33 +1,33 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conf-parser.o: \
-  jni/pdnsd/src/conf-parser.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/conff.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/conf-keywords.h \
-  jni/pdnsd/src/conf-parser.h
+  jni\pdnsd\src\conf-parser.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\conff.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\conf-keywords.h \
+  jni\pdnsd\src\conf-parser.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/conf-keywords.h:
+jni\pdnsd\src\conf-keywords.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conff.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conff.o
index 2cc1cb79..88977947 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conff.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conff.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conff.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conff.o.d
index bd266498..6b66a74b 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conff.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conff.o.d
@@ -1,33 +1,33 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/conff.o: \
-  jni/pdnsd/src/conff.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/conff.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conf-parser.h jni/pdnsd/src/servers.h \
-  jni/pdnsd/src/icmp.h
+  jni\pdnsd\src\conff.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\conff.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conf-parser.h jni\pdnsd\src\servers.h \
+  jni\pdnsd\src\icmp.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/consts.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/consts.o
index 8b75a9f9..5a8aaff0 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/consts.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/consts.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/consts.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/consts.o.d
index c2d77b29..6376d2ee 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/consts.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/consts.o.d
@@ -1,9 +1,9 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/consts.o: \
-  jni/pdnsd/src/consts.c jni/pdnsd/config.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/rr_types.h
+  jni\pdnsd\src\consts.c jni\pdnsd\config.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\rr_types.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/debug.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/debug.o
index adcf81ed..eb69201c 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/debug.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/debug.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/debug.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/debug.o.d
index 2960b46f..8a506f70 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/debug.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/debug.o.d
@@ -1,27 +1,27 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/debug.o: \
-  jni/pdnsd/src/debug.c jni/pdnsd/config.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/list.h jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conff.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h
+  jni\pdnsd\src\debug.c jni\pdnsd\config.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\list.h jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conff.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns.o
index 0b3ef1fe..558a9a63 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns.o.d
index 38877c93..3c012a67 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns.o.d
@@ -1,27 +1,27 @@
-./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns.o: jni/pdnsd/src/dns.c \
-  jni/pdnsd/config.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns.o: jni\pdnsd\src\dns.c \
+  jni\pdnsd\config.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_answer.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_answer.o
index fa59aa93..d4649215 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_answer.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_answer.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_answer.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_answer.o.d
index 96b14061..c88268db 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_answer.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_answer.o.d
@@ -1,35 +1,35 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_answer.o: \
-  jni/pdnsd/src/dns_answer.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/thread.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/dns_answer.h jni/pdnsd/src/dns_query.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/conff.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/debug.h
+  jni\pdnsd\src\dns_answer.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\thread.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\dns_answer.h jni\pdnsd\src\dns_query.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\conff.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_query.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_query.o
index 9c3da424..d421888a 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_query.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_query.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_query.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_query.o.d
index 0a1d3a90..1acf048b 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_query.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_query.o.d
@@ -1,40 +1,40 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/dns_query.o: \
-  jni/pdnsd/src/dns_query.c jni/pdnsd/config.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/dns_query.h jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conff.h jni/pdnsd/src/servers.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/debug.h
+  jni\pdnsd\src\dns_query.c jni\pdnsd\config.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\dns_query.h jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conff.h jni\pdnsd\src\servers.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/error.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/error.o
index 50625d19..48cb9138 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/error.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/error.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/error.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/error.o.d
index edce5aca..97c9b852 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/error.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/error.o.d
@@ -1,27 +1,27 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/error.o: \
-  jni/pdnsd/src/error.c jni/pdnsd/config.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/thread.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+  jni\pdnsd\src\error.c jni\pdnsd\config.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\thread.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/hash.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/hash.o
index 3e3c2ca0..94f75a32 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/hash.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/hash.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/hash.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/hash.o.d
index 7b920066..7e7665b4 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/hash.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/hash.o.d
@@ -1,32 +1,32 @@
-./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/hash.o: jni/pdnsd/src/hash.c \
-  jni/pdnsd/config.h jni/pdnsd/src/hash.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/consts.h
+./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/hash.o: jni\pdnsd\src\hash.c \
+  jni\pdnsd\config.h jni\pdnsd\src\hash.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\consts.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/helpers.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/helpers.o
index 0b4ac72a..78118109 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/helpers.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/helpers.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/helpers.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/helpers.o.d
index a7dd1ddb..d86e89b1 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/helpers.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/helpers.o.d
@@ -1,27 +1,27 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/helpers.o: \
-  jni/pdnsd/src/helpers.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/thread.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+  jni\pdnsd\src\helpers.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\thread.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/icmp.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/icmp.o
index 556baa60..0a041968 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/icmp.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/icmp.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/icmp.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/icmp.o.d
index 5b897c70..30decb27 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/icmp.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/icmp.o.d
@@ -1,34 +1,34 @@
-./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/icmp.o: jni/pdnsd/src/icmp.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/icmp.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/servers.h jni/pdnsd/src/consts.h
+./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/icmp.o: jni\pdnsd\src\icmp.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\icmp.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\servers.h jni\pdnsd\src\consts.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/list.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/list.o
index 6f02902f..4a23c447 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/list.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/list.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/list.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/list.o.d
index 286edaf1..9c02733a 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/list.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/list.o.d
@@ -1,27 +1,27 @@
-./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/list.o: jni/pdnsd/src/list.c \
-  jni/pdnsd/config.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h
+./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/list.o: jni\pdnsd\src\list.c \
+  jni\pdnsd\config.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/main.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/main.o
index c14188de..0deac324 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/main.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/main.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/main.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/main.o.d
index a162ca06..952858f4 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/main.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/main.o.d
@@ -1,44 +1,44 @@
-./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/main.o: jni/pdnsd/src/main.c \
-  jni/pdnsd/config.h jni/pdnsd/src/consts.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/status.h jni/pdnsd/src/servers.h \
-  jni/pdnsd/src/dns_answer.h jni/pdnsd/src/dns_query.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/icmp.h jni/pdnsd/src/hash.h
+./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/main.o: jni\pdnsd\src\main.c \
+  jni\pdnsd\config.h jni\pdnsd\src\consts.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\status.h jni\pdnsd\src\servers.h \
+  jni\pdnsd\src\dns_answer.h jni\pdnsd\src\dns_query.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\icmp.h jni\pdnsd\src\hash.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/status.h:
+jni\pdnsd\src\status.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/netdev.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/netdev.o
index 76461754..a6db4284 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/netdev.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/netdev.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/netdev.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/netdev.o.d
index 8e9693ca..4b5d90b4 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/netdev.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/netdev.o.d
@@ -1,30 +1,30 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/netdev.o: \
-  jni/pdnsd/src/netdev.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/list.h jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conff.h jni/pdnsd/src/netdev.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/thread.h
+  jni\pdnsd\src\netdev.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\list.h jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conff.h jni\pdnsd\src\netdev.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/rr_types.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/rr_types.o
index 73c9ee45..d1f19a83 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/rr_types.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/rr_types.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/rr_types.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/rr_types.o.d
index 799ba88e..9b529796 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/rr_types.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/rr_types.o.d
@@ -1,23 +1,23 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/rr_types.o: \
-  jni/pdnsd/src/rr_types.c jni/pdnsd/config.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/list.h jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conff.h
+  jni\pdnsd\src\rr_types.c jni\pdnsd\config.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\list.h jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/servers.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/servers.o
index 0e373c22..a2022f7f 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/servers.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/servers.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/servers.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/servers.o.d
index fab29b04..1a2fee1c 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/servers.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/servers.o.d
@@ -1,39 +1,39 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/servers.o: \
-  jni/pdnsd/src/servers.c jni/pdnsd/config.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/servers.h jni/pdnsd/src/consts.h jni/pdnsd/src/icmp.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/dns_query.h
+  jni\pdnsd\src\servers.c jni\pdnsd\config.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\servers.h jni\pdnsd\src\consts.h jni\pdnsd\src\icmp.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\dns_query.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/status.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/status.o
index ab2f9bdf..03b4c412 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/status.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/status.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/status.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/status.o.d
index e3ba7c88..b92788e4 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/status.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/status.o.d
@@ -1,40 +1,40 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/status.o: \
-  jni/pdnsd/src/status.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/status.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/list.h jni/pdnsd/src/pdnsd_assert.h \
-  jni/pdnsd/src/thread.h jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/helpers.h jni/pdnsd/src/servers.h \
-  jni/pdnsd/src/consts.h jni/pdnsd/src/dns_answer.h \
-  jni/pdnsd/src/conf-parser.h
+  jni\pdnsd\src\status.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\status.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\list.h jni\pdnsd\src\pdnsd_assert.h \
+  jni\pdnsd\src\thread.h jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\helpers.h jni\pdnsd\src\servers.h \
+  jni\pdnsd\src\consts.h jni\pdnsd\src\dns_answer.h \
+  jni\pdnsd\src\conf-parser.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/status.h:
+jni\pdnsd\src\status.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/thread.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/thread.o
index 95ab0c21..110b5794 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/thread.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/thread.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/thread.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/thread.o.d
index fdd1a65b..bff9df58 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/thread.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/thread.o.d
@@ -1,27 +1,27 @@
 ./obj/local/armeabi-v7a/objs/pdnsd/pdnsd/src/thread.o: \
-  jni/pdnsd/src/thread.c jni/pdnsd/config.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+  jni\pdnsd\src\thread.c jni\pdnsd\config.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o
index 2bb7aece..f7778f8f 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
index 1eb61c40..335d45f2 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
@@ -1,23 +1,23 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o: \
-  jni/../../../../external/badvpn/base/BLog.c \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channels_list.h
+  jni\..\..\..\..\external\badvpn\base\BLog.c \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_list.h
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_list.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_list.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o
index 86e62fbc..d323cace 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
index 6abfb38f..71d4048e 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
@@ -1,23 +1,23 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o: \
-  jni/../../../../external/badvpn/base/BLog_syslog.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog_syslog.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog_syslog.h:
+jni\..\..\..\..\external\badvpn\base\BLog_syslog.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o
index 10ba1f8f..61c914aa 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
index 6730e675..3408af87 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
@@ -1,38 +1,38 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o: \
-  jni/../../../../external/badvpn/base/BPending.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_impl.h
+  jni\..\..\..\..\external\badvpn\base\BPending.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_impl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_impl.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o
index 9895c56d..69c89b7d 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
index 7fd80b64..306b7dfc 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
@@ -1,11 +1,11 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o: \
-  jni/../../../../external/badvpn/base/DebugObject.c \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h
+  jni\..\..\..\..\external\badvpn\base\DebugObject.c \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o
index 9826158e..089e3b6d 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
index a87f73e8..bda7c645 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
@@ -1,38 +1,38 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o: \
-  jni/../../../../external/badvpn/flow/BufferWriter.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o
index d276dad9..7c8c2859 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
index c5840b4f..546229c4 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
@@ -1,56 +1,56 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o: \
-  jni/../../../../external/badvpn/flow/PacketBuffer.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o
index eded4857..d01c7eaa 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
index 53377fb2..b3675a77 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
@@ -1,38 +1,38 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o: \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o
index 7879ab62..0bef2045 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
index 953d5eb1..605745ee 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
@@ -1,86 +1,86 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o: \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_impl.h \
-  jni/../../../../external/badvpn/structure/CAvl_impl.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_impl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_impl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o
index 6f1a9539..25a5ba94 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
index d5854bf0..2f1db3f2 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o: \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.c \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o
index 53591cbe..52904a0f 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
index 3f6062f4..df900b5b 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
@@ -1,65 +1,65 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_PacketProtoDecoder.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_PacketProtoDecoder.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_PacketProtoDecoder.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o
index 209c2d3c..32d43fe3 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
index 64f8806e..c5ea3d3b 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
@@ -1,50 +1,50 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.c \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.c \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o
index 0bce3ab3..2684b44d 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
index 65b120c6..edaaf3ed 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
@@ -1,62 +1,62 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.c \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.c \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o
index e2a56b67..ac129f20 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
index 767a9864..ef63fc0e 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o: \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.c \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o
index ffe985b8..79e3bacd 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
index b954bb18..7650633f 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
@@ -1,41 +1,41 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o: \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o
index 2bd2858c..2a0a0397 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
index d9d96de6..09c2dcd1 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
@@ -1,50 +1,50 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o: \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/flow/SinglePacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o
index ed7dcc8c..554af36c 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
index 1f7b27d0..69dbe7cb 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o: \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.c \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o
index 56a28785..0bbd067f 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
index b93becf7..04075893 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o: \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.c \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o
index 792ec226..d3fee106 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
index 8689a457..f1a20f88 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
@@ -1,80 +1,80 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o: \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.c \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.c \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o
index 6ec72ccd..513971d4 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
index 32d79bec..a6570af2 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
@@ -1,56 +1,56 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o: \
-  jni/../../../../external/badvpn/lwip/custom/sys.c \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h
+  jni\..\..\..\..\external\badvpn\lwip\custom\sys.c \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o
index 4a705ac7..965da328 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
index 249487b1..161fdc5f 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
@@ -1,47 +1,47 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o: \
-  jni/../../../../external/badvpn/lwip/src/core/def.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\def.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o
index a37434a2..15df4d3e 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
index 085faff0..0dc998fc 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
@@ -1,65 +1,65 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o: \
-  jni/../../../../external/badvpn/lwip/src/core/inet_chksum.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\inet_chksum.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o
index 8dcb09bb..09be4661 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
index 0bbd7311..4a960773 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
@@ -1,146 +1,146 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o: \
-  jni/../../../../external/badvpn/lwip/src/core/init.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/init.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sockets.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\init.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sockets.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/init.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sockets.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sockets.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o
index 5f18b766..633a383c 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
index d21aec91..ac43f718 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
@@ -1,44 +1,44 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/autoip.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\autoip.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o
index dd7300eb..c8e0605f 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
index 9147e7a0..eba87342 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
@@ -1,98 +1,98 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/icmp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\icmp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o
index 675667be..e615a9df 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
index 9f3c06bb..ca39f9f1 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
@@ -1,44 +1,44 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/igmp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\igmp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o
index c92bdfa5..062a6341 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
index 7ce5d877..6bb3241a 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
@@ -1,125 +1,125 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip4.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip4.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o
index b42df291..7ee55140 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
index 4dfb2de7..54c92b31 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
@@ -1,65 +1,65 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip4_addr.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip4_addr.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o
index 0c5c39e9..de985507 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
index ad94592c..76649285 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
@@ -1,101 +1,101 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip_frag.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip_frag.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o
index a38c9e05..58d36cdf 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
index 44392df9..d2e35028 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/dhcp6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\dhcp6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o
index e5c4c1c6..fccf887a 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
index 1072c63a..3fd9124c 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ethip6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ethip6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o
index e6f8857e..4f553b70 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
index 86daa685..c3934018 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
@@ -1,98 +1,98 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/icmp6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\icmp6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o
index 644274ca..6fb5c899 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
index 25e0ef62..4a380d7e 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/inet6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\inet6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o
index 34bd3a98..3e771f4d 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
index 5ed3a69f..9dd00fdc 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
@@ -1,116 +1,116 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\dhcp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\dhcp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o
index 11eead4c..343a601f 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
index 61020e30..133d2bc6 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
@@ -1,50 +1,50 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6_addr.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6_addr.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o
index 697e0ffc..ed3548ca 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
index 858a4c0c..f1634bf3 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
@@ -1,95 +1,95 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6_frag.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6_frag.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o
index 7b917d21..88802d40 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
index 337e45e8..77702d20 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/mld6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\mld6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o
index fb42fae9..0c082653 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
index ba8d53af..92a463b3 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
@@ -1,98 +1,98 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/nd6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\nd6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o
index c4d023c9..ab51dfe4 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
index 2a568bd1..b5fa78f8 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
@@ -1,44 +1,44 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o: \
-  jni/../../../../external/badvpn/lwip/src/core/mem.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\mem.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o
index a37b3341..fd781090 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
index dfab2266..b798faeb 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
@@ -1,152 +1,152 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/memp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/ppp_oe.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\memp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\ppp_oe.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/ppp_oe.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\ppp_oe.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o
index 3f8d6931..1e279c38 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
index d02e3a35..7f58b049 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
@@ -1,107 +1,107 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o: \
-  jni/../../../../external/badvpn/lwip/src/core/netif.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\netif.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o
index 40b90bb7..a64a6d09 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
index cecba7c3..b000b536 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
@@ -1,104 +1,104 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o: \
-  jni/../../../../external/badvpn/lwip/src/core/pbuf.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\pbuf.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o
index 4f5ad117..35fd8fd3 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
index 0964722e..b0b81edc 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
@@ -1,59 +1,59 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o: \
-  jni/../../../../external/badvpn/lwip/src/core/stats.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\stats.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o
index 55734e64..b58979f0 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
index 671ee974..83be8054 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
@@ -1,104 +1,104 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o
index c54143b5..46b96c0c 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
index 4a35395c..cff12d57 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
@@ -1,110 +1,110 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp_in.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp_in.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o
index 33e80f95..77f52e47 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
index 9e9bee67..b9223f12 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
@@ -1,104 +1,104 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp_out.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp_out.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o
index 1101dc89..02621114 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
index 890baf05..ae92cdc9 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
@@ -1,131 +1,131 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o: \
-  jni/../../../../external/badvpn/lwip/src/core/timers.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\timers.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o
index c4cb07a9..822d2a88 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
index a0b30ae9..e4799709 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
@@ -1,44 +1,44 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/udp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\udp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o
index cb4183d4..56e6653b 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
index 87a56728..7bf1d157 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
@@ -1,134 +1,134 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o: \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.c \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BSocksClient.h
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.c \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BSocksClient.h
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BSocksClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BSocksClient.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o
index 779ac480..1e63cb60 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
index 8be61bfb..2c4a77b1 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
@@ -1,116 +1,116 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o: \
-  jni/../../../../external/badvpn/system/BConnection_unix.c \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/misc/strdup.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BConnection.h
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.c \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\misc\strdup.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BConnection.h
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/misc/strdup.h:
+jni\..\..\..\..\external\badvpn\misc\strdup.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BConnection.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BConnection.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o
index 8901d959..ee914e35 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
index bc40c7ee..295234d8 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
@@ -1,113 +1,113 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o: \
-  jni/../../../../external/badvpn/system/BDatagram_unix.c \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BDatagram.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BDatagram_unix.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BDatagram.h
+  jni\..\..\..\..\external\badvpn\system\BDatagram_unix.c \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BDatagram.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BDatagram_unix.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BDatagram.h
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BDatagram.h:
+jni\..\..\..\..\external\badvpn\system\BDatagram.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BDatagram_unix.h:
+jni\..\..\..\..\external\badvpn\system\BDatagram_unix.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BDatagram.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BDatagram.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o
index 1eab47ef..f9b618c8 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
index 4ddc68a8..1d5b16a1 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
@@ -1,26 +1,26 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o: \
-  jni/../../../../external/badvpn/system/BNetwork.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BNetwork.h
+  jni\..\..\..\..\external\badvpn\system\BNetwork.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BNetwork.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BNetwork.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BNetwork.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o
index d6014d80..5862f748 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
index e35ae2b7..3f96fcca 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
@@ -1,95 +1,95 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o: \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BReactor.h \
-  jni/../../../../external/badvpn/structure/CAvl_impl.h
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BReactor.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BReactor.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BReactor.h:
 
-jni/../../../../external/badvpn/structure/CAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o
index d55789af..b298b1ba 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
index ba6ed65c..a47f893d 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
@@ -1,83 +1,83 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o: \
-  jni/../../../../external/badvpn/system/BSignal.c \
-  jni/../../../../external/badvpn/system/BUnixSignal.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BSignal.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BSignal.h
+  jni\..\..\..\..\external\badvpn\system\BSignal.c \
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BSignal.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BSignal.h
 
-jni/../../../../external/badvpn/system/BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\system\BUnixSignal.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BSignal.h:
+jni\..\..\..\..\external\badvpn\system\BSignal.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BSignal.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BSignal.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o
index d36558e3..81845075 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
index 89beaed5..8ff5e11b 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
@@ -1,29 +1,29 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o: \
-  jni/../../../../external/badvpn/system/BTime.c \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h
+  jni\..\..\..\..\external\badvpn\system\BTime.c \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o
index 9b7c16ca..90655b77 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
index 5a8e0f7b..867ca3e7 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
@@ -1,92 +1,92 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o: \
-  jni/../../../../external/badvpn/system/BUnixSignal.c \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BUnixSignal.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BUnixSignal.h
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.c \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BUnixSignal.h
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\system\BUnixSignal.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BUnixSignal.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o
index 85c6a692..7de81fe5 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
index 8d670b32..c07ba694 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
@@ -1,194 +1,194 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o: \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/generated/blog_channel_SocksUdpGwClient.h
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_SocksUdpGwClient.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_SocksUdpGwClient.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o
index a8e438e4..d02738c6 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
index e7f6104f..4586bf9f 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
@@ -1,329 +1,329 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o: \
-  jni/../../../../external/badvpn/tun2socks/tun2socks.c \
-  jni/../../../../external/badvpn/misc/version.h \
-  jni/../../../../external/badvpn/misc/loggers_string.h \
-  jni/../../../../external/badvpn/misc/loglevel.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/dead.h \
-  jni/../../../../external/badvpn/misc/ipv4_proto.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/ipv6_proto.h \
-  jni/../../../../external/badvpn/misc/udp_proto.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/open_standard_streams.h \
-  jni/../../../../external/badvpn/misc/read_file.h \
-  jni/../../../../external/badvpn/misc/ipaddr6.h \
-  jni/../../../../external/badvpn/misc/parse_number.h \
-  jni/../../../../external/badvpn/misc/cstring.h \
-  jni/../../../../external/badvpn/misc/find_char.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/concat_strings.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BSignal.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/tuntap/BTap.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/init.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/base/BLog_syslog.h \
-  jni/../../../../external/badvpn/tun2socks/tun2socks.h \
-  jni/../../../../external/badvpn/generated/blog_channel_tun2socks.h \
-  jni/libancillary/ancillary.h
+  jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.c \
+  jni\..\..\..\..\external\badvpn\misc\version.h \
+  jni\..\..\..\..\external\badvpn\misc\loggers_string.h \
+  jni\..\..\..\..\external\badvpn\misc\loglevel.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\dead.h \
+  jni\..\..\..\..\external\badvpn\misc\ipv4_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\ipv6_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\udp_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\open_standard_streams.h \
+  jni\..\..\..\..\external\badvpn\misc\read_file.h \
+  jni\..\..\..\..\external\badvpn\misc\ipaddr6.h \
+  jni\..\..\..\..\external\badvpn\misc\parse_number.h \
+  jni\..\..\..\..\external\badvpn\misc\cstring.h \
+  jni\..\..\..\..\external\badvpn\misc\find_char.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\concat_strings.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BSignal.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_tun2socks.h \
+  jni\libancillary\ancillary.h
 
-jni/../../../../external/badvpn/misc/version.h:
+jni\..\..\..\..\external\badvpn\misc\version.h:
 
-jni/../../../../external/badvpn/misc/loggers_string.h:
+jni\..\..\..\..\external\badvpn\misc\loggers_string.h:
 
-jni/../../../../external/badvpn/misc/loglevel.h:
+jni\..\..\..\..\external\badvpn\misc\loglevel.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/dead.h:
+jni\..\..\..\..\external\badvpn\misc\dead.h:
 
-jni/../../../../external/badvpn/misc/ipv4_proto.h:
+jni\..\..\..\..\external\badvpn\misc\ipv4_proto.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/ipv6_proto.h:
+jni\..\..\..\..\external\badvpn\misc\ipv6_proto.h:
 
-jni/../../../../external/badvpn/misc/udp_proto.h:
+jni\..\..\..\..\external\badvpn\misc\udp_proto.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/open_standard_streams.h:
+jni\..\..\..\..\external\badvpn\misc\open_standard_streams.h:
 
-jni/../../../../external/badvpn/misc/read_file.h:
+jni\..\..\..\..\external\badvpn\misc\read_file.h:
 
-jni/../../../../external/badvpn/misc/ipaddr6.h:
+jni\..\..\..\..\external\badvpn\misc\ipaddr6.h:
 
-jni/../../../../external/badvpn/misc/parse_number.h:
+jni\..\..\..\..\external\badvpn\misc\parse_number.h:
 
-jni/../../../../external/badvpn/misc/cstring.h:
+jni\..\..\..\..\external\badvpn\misc\cstring.h:
 
-jni/../../../../external/badvpn/misc/find_char.h:
+jni\..\..\..\..\external\badvpn\misc\find_char.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/concat_strings.h:
+jni\..\..\..\..\external\badvpn\misc\concat_strings.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BSignal.h:
+jni\..\..\..\..\external\badvpn\system\BSignal.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/flow/SinglePacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/tuntap/BTap.h:
+jni\..\..\..\..\external\badvpn\tuntap\BTap.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/init.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/base/BLog_syslog.h:
+jni\..\..\..\..\external\badvpn\base\BLog_syslog.h:
 
-jni/../../../../external/badvpn/tun2socks/tun2socks.h:
+jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_tun2socks.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_tun2socks.h:
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o
index 14bb73ba..50a681b6 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
index b5df4d92..3cad64e1 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
@@ -1,86 +1,86 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o: \
-  jni/../../../../external/badvpn/tuntap/BTap.c \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/tuntap/BTap.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTap.h
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.c \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTap.h
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/tuntap/BTap.h:
+jni\..\..\..\..\external\badvpn\tuntap\BTap.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTap.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTap.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o
index d2e1f964..4bc36e68 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o and b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o differ
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
index 25112059..b7b5b786 100644
--- a/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
+++ b/orbotmanager/src/main/obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
@@ -1,176 +1,176 @@
 ./obj/local/armeabi-v7a/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o: \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.c \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/generated/blog_channel_UdpGwClient.h
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.c \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_UdpGwClient.h
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_UdpGwClient.h:
diff --git a/orbotmanager/src/main/obj/local/armeabi-v7a/pdnsd b/orbotmanager/src/main/obj/local/armeabi-v7a/pdnsd
index 1db9cbf2..0b0b6f80 100644
Binary files a/orbotmanager/src/main/obj/local/armeabi-v7a/pdnsd and b/orbotmanager/src/main/obj/local/armeabi-v7a/pdnsd differ
diff --git a/orbotmanager/src/main/obj/local/x86/libancillary.a b/orbotmanager/src/main/obj/local/x86/libancillary.a
index b25d2279..a3c0d303 100644
Binary files a/orbotmanager/src/main/obj/local/x86/libancillary.a and b/orbotmanager/src/main/obj/local/x86/libancillary.a differ
diff --git a/orbotmanager/src/main/obj/local/x86/libtun2socks.so b/orbotmanager/src/main/obj/local/x86/libtun2socks.so
index 19f20c44..4ae728b5 100644
Binary files a/orbotmanager/src/main/obj/local/x86/libtun2socks.so and b/orbotmanager/src/main/obj/local/x86/libtun2socks.so differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_recv.o b/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_recv.o
index fb4437cf..2ae1f632 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_recv.o and b/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_recv.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_recv.o.d b/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_recv.o.d
index b4326633..15b96536 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_recv.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_recv.o.d
@@ -1,4 +1,4 @@
 ./obj/local/x86/objs/ancillary/libancillary/fd_recv.o: \
-  jni/libancillary/fd_recv.c jni/libancillary/ancillary.h
+  jni\libancillary\fd_recv.c jni\libancillary\ancillary.h
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_send.o b/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_send.o
index ad7891ad..01d83ac0 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_send.o and b/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_send.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_send.o.d b/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_send.o.d
index 667316d0..3661bb26 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_send.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/ancillary/libancillary/fd_send.o.d
@@ -1,4 +1,4 @@
 ./obj/local/x86/objs/ancillary/libancillary/fd_send.o: \
-  jni/libancillary/fd_send.c jni/libancillary/ancillary.h
+  jni\libancillary\fd_send.c jni\libancillary\ancillary.h
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/cache.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/cache.o
index 59416be1..b098b2d2 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/cache.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/cache.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/cache.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/cache.o.d
index a5c4b888..f3da60f9 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/cache.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/cache.o.d
@@ -1,32 +1,32 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/cache.o: jni/pdnsd/src/cache.c \
-  jni/pdnsd/config.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/hash.h jni/pdnsd/src/helpers.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/thread.h jni/pdnsd/src/debug.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/cache.o: jni\pdnsd\src\cache.c \
+  jni\pdnsd\config.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\hash.h jni\pdnsd\src\helpers.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\thread.h jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conf-parser.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conf-parser.o
index 6ba1f95d..1954378b 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conf-parser.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conf-parser.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conf-parser.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conf-parser.o.d
index fa453ff6..15d4eca4 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conf-parser.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conf-parser.o.d
@@ -1,33 +1,33 @@
 ./obj/local/x86/objs/pdnsd/pdnsd/src/conf-parser.o: \
-  jni/pdnsd/src/conf-parser.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/conff.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/conf-keywords.h \
-  jni/pdnsd/src/conf-parser.h
+  jni\pdnsd\src\conf-parser.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\conff.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\conf-keywords.h \
+  jni\pdnsd\src\conf-parser.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/conf-keywords.h:
+jni\pdnsd\src\conf-keywords.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conff.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conff.o
index 09a153c3..2efe7432 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conff.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conff.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conff.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conff.o.d
index d08b52b9..a20c78b3 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conff.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/conff.o.d
@@ -1,33 +1,33 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/conff.o: jni/pdnsd/src/conff.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/conff.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conf-parser.h jni/pdnsd/src/servers.h \
-  jni/pdnsd/src/icmp.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/conff.o: jni\pdnsd\src\conff.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\conff.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conf-parser.h jni\pdnsd\src\servers.h \
+  jni\pdnsd\src\icmp.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/consts.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/consts.o
index 118281df..7ac2315a 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/consts.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/consts.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/consts.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/consts.o.d
index 13a13cd9..9aafcb80 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/consts.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/consts.o.d
@@ -1,8 +1,8 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/consts.o: jni/pdnsd/src/consts.c \
-  jni/pdnsd/config.h jni/pdnsd/src/consts.h jni/pdnsd/src/rr_types.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/consts.o: jni\pdnsd\src\consts.c \
+  jni\pdnsd\config.h jni\pdnsd\src\consts.h jni\pdnsd\src\rr_types.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/debug.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/debug.o
index 5241d62c..cd7a81c8 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/debug.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/debug.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/debug.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/debug.o.d
index b735652e..0036a159 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/debug.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/debug.o.d
@@ -1,27 +1,27 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/debug.o: jni/pdnsd/src/debug.c \
-  jni/pdnsd/config.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/debug.o: jni\pdnsd\src\debug.c \
+  jni\pdnsd\config.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns.o
index 1ecaa205..4d5e2fe0 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns.o.d
index 43b0ab54..7d2c11ce 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns.o.d
@@ -1,27 +1,27 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/dns.o: jni/pdnsd/src/dns.c \
-  jni/pdnsd/config.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/dns.o: jni\pdnsd\src\dns.c \
+  jni\pdnsd\config.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_answer.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_answer.o
index 7462d8b3..aa50faa5 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_answer.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_answer.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_answer.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_answer.o.d
index c263f570..151bb9af 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_answer.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_answer.o.d
@@ -1,35 +1,35 @@
 ./obj/local/x86/objs/pdnsd/pdnsd/src/dns_answer.o: \
-  jni/pdnsd/src/dns_answer.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/thread.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/dns_answer.h jni/pdnsd/src/dns_query.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/conff.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/debug.h
+  jni\pdnsd\src\dns_answer.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\thread.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\dns_answer.h jni\pdnsd\src\dns_query.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\conff.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_query.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_query.o
index 6e8ac695..96afebcd 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_query.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_query.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_query.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_query.o.d
index 8ebec423..ce2fd900 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_query.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/dns_query.o.d
@@ -1,40 +1,40 @@
 ./obj/local/x86/objs/pdnsd/pdnsd/src/dns_query.o: \
-  jni/pdnsd/src/dns_query.c jni/pdnsd/config.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/dns_query.h jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conff.h jni/pdnsd/src/servers.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/debug.h
+  jni\pdnsd\src\dns_query.c jni\pdnsd\config.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\dns_query.h jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conff.h jni\pdnsd\src\servers.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/error.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/error.o
index 173f1bdb..8652e835 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/error.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/error.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/error.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/error.o.d
index 2b10effb..3942e4a0 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/error.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/error.o.d
@@ -1,27 +1,27 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/error.o: jni/pdnsd/src/error.c \
-  jni/pdnsd/config.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/error.o: jni\pdnsd\src\error.c \
+  jni\pdnsd\config.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/hash.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/hash.o
index 67c13ca1..1002c3ee 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/hash.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/hash.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/hash.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/hash.o.d
index 2b31f0c7..57833496 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/hash.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/hash.o.d
@@ -1,32 +1,32 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/hash.o: jni/pdnsd/src/hash.c \
-  jni/pdnsd/config.h jni/pdnsd/src/hash.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/consts.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/hash.o: jni\pdnsd\src\hash.c \
+  jni\pdnsd\config.h jni\pdnsd\src\hash.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\consts.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/helpers.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/helpers.o
index e875b6a4..fed9945b 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/helpers.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/helpers.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/helpers.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/helpers.o.d
index 91d9963e..34ef3654 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/helpers.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/helpers.o.d
@@ -1,27 +1,27 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/helpers.o: jni/pdnsd/src/helpers.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/thread.h jni/pdnsd/src/error.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/helpers.o: jni\pdnsd\src\helpers.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\thread.h jni\pdnsd\src\error.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/icmp.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/icmp.o
index 6b5c1cad..2e60390b 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/icmp.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/icmp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/icmp.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/icmp.o.d
index 0cbb453a..30e2bcaa 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/icmp.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/icmp.o.d
@@ -1,34 +1,34 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/icmp.o: jni/pdnsd/src/icmp.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/icmp.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/servers.h jni/pdnsd/src/consts.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/icmp.o: jni\pdnsd\src\icmp.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\icmp.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\servers.h jni\pdnsd\src\consts.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/list.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/list.o
index 6551fc87..90c63704 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/list.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/list.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/list.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/list.o.d
index 97997d44..074b3c1f 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/list.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/list.o.d
@@ -1,27 +1,27 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/list.o: jni/pdnsd/src/list.c \
-  jni/pdnsd/config.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/list.o: jni\pdnsd\src\list.c \
+  jni\pdnsd\config.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/main.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/main.o
index c5c814f3..7cbe26c6 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/main.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/main.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/main.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/main.o.d
index 5c2ff099..6e974998 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/main.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/main.o.d
@@ -1,44 +1,44 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/main.o: jni/pdnsd/src/main.c \
-  jni/pdnsd/config.h jni/pdnsd/src/consts.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/status.h jni/pdnsd/src/servers.h \
-  jni/pdnsd/src/dns_answer.h jni/pdnsd/src/dns_query.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/icmp.h jni/pdnsd/src/hash.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/main.o: jni\pdnsd\src\main.c \
+  jni\pdnsd\config.h jni\pdnsd\src\consts.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\status.h jni\pdnsd\src\servers.h \
+  jni\pdnsd\src\dns_answer.h jni\pdnsd\src\dns_query.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\icmp.h jni\pdnsd\src\hash.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/status.h:
+jni\pdnsd\src\status.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/netdev.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/netdev.o
index ea42ea9c..a7ff5428 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/netdev.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/netdev.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/netdev.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/netdev.o.d
index 5dfb0255..0a7084e1 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/netdev.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/netdev.o.d
@@ -1,29 +1,29 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/netdev.o: jni/pdnsd/src/netdev.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/netdev.o: jni\pdnsd\src\netdev.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/rr_types.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/rr_types.o
index ea55de2c..d55af214 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/rr_types.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/rr_types.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/rr_types.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/rr_types.o.d
index a5110af0..429b603b 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/rr_types.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/rr_types.o.d
@@ -1,22 +1,22 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/rr_types.o: jni/pdnsd/src/rr_types.c \
-  jni/pdnsd/config.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/rr_types.o: jni\pdnsd\src\rr_types.c \
+  jni\pdnsd\config.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/servers.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/servers.o
index f6185bf5..69d0af12 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/servers.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/servers.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/servers.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/servers.o.d
index 1af390b4..d7f957f4 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/servers.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/servers.o.d
@@ -1,39 +1,39 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/servers.o: jni/pdnsd/src/servers.c \
-  jni/pdnsd/config.h jni/pdnsd/src/thread.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/servers.h jni/pdnsd/src/consts.h jni/pdnsd/src/icmp.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/dns_query.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/servers.o: jni\pdnsd\src\servers.c \
+  jni\pdnsd\config.h jni\pdnsd\src\thread.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\servers.h jni\pdnsd\src\consts.h jni\pdnsd\src\icmp.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\dns_query.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/status.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/status.o
index 34bd8224..b628038c 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/status.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/status.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/status.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/status.o.d
index a66f08ee..a7b324b2 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/status.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/status.o.d
@@ -1,39 +1,39 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/status.o: jni/pdnsd/src/status.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/status.h jni/pdnsd/src/conff.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/servers.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/dns_answer.h jni/pdnsd/src/conf-parser.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/status.o: jni\pdnsd\src\status.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\status.h jni\pdnsd\src\conff.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\servers.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\dns_answer.h jni\pdnsd\src\conf-parser.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/status.h:
+jni\pdnsd\src\status.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/thread.o b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/thread.o
index 6372887e..85699657 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/thread.o and b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/thread.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/thread.o.d b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/thread.o.d
index f368282d..7bada9c3 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/thread.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/pdnsd/pdnsd/src/thread.o.d
@@ -1,27 +1,27 @@
-./obj/local/x86/objs/pdnsd/pdnsd/src/thread.o: jni/pdnsd/src/thread.c \
-  jni/pdnsd/config.h jni/pdnsd/src/thread.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+./obj/local/x86/objs/pdnsd/pdnsd/src/thread.o: jni\pdnsd\src\thread.c \
+  jni\pdnsd\config.h jni\pdnsd\src\thread.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o
index 8ea4699f..66f5f296 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
index 259d4787..cef1eb33 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
@@ -1,23 +1,23 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o: \
-  jni/../../../../external/badvpn/base/BLog.c \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channels_list.h
+  jni\..\..\..\..\external\badvpn\base\BLog.c \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_list.h
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_list.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_list.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o
index 92e2e09b..5feb55b2 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
index 277bcd8f..70b0a2f6 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
@@ -1,23 +1,23 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o: \
-  jni/../../../../external/badvpn/base/BLog_syslog.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog_syslog.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog_syslog.h:
+jni\..\..\..\..\external\badvpn\base\BLog_syslog.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o
index 12a0de6b..4320c10a 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
index 1f9f7040..f7676760 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
@@ -1,38 +1,38 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o: \
-  jni/../../../../external/badvpn/base/BPending.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_impl.h
+  jni\..\..\..\..\external\badvpn\base\BPending.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_impl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_impl.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o
index 65066103..843c5c65 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
index e32aca02..a3aa0d36 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
@@ -1,11 +1,11 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o: \
-  jni/../../../../external/badvpn/base/DebugObject.c \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h
+  jni\..\..\..\..\external\badvpn\base\DebugObject.c \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o
index 3d41da38..b1494984 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
index dadb30e0..8ea3b9c4 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
@@ -1,38 +1,38 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o: \
-  jni/../../../../external/badvpn/flow/BufferWriter.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o
index 63313252..fa1267e2 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
index 3ce20c10..e7982eb5 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
@@ -1,56 +1,56 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o: \
-  jni/../../../../external/badvpn/flow/PacketBuffer.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o
index fa5e1114..b2c78d05 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
index 126c0ef0..2801f5b3 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
@@ -1,38 +1,38 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o: \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o
index 2e37946d..5e6a60e2 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
index f683acb6..7d09b2e9 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
@@ -1,86 +1,86 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o: \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_impl.h \
-  jni/../../../../external/badvpn/structure/CAvl_impl.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_impl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_impl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o
index c6fbaabc..7162efbb 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
index 26b7ce32..5b963c60 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o: \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.c \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o
index 5e419f3b..5f348a32 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
index e6a25c59..27964516 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
@@ -1,65 +1,65 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_PacketProtoDecoder.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_PacketProtoDecoder.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_PacketProtoDecoder.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o
index 346b2677..0d1a9022 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
index 88caa132..4df8ef66 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
@@ -1,50 +1,50 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.c \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.c \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o
index ec2f1e05..c4f0aadc 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
index 885fdd61..0b846a25 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
@@ -1,62 +1,62 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.c \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.c \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o
index dd631b90..a15f0b5c 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
index 19fd75f7..2808575d 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o: \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.c \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o
index f1f97581..50a3bee6 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
index ef553fe1..c2aff8e2 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
@@ -1,41 +1,41 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o: \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o
index acefbbaf..d595c37a 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
index 2abf2c5a..ddacafae 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
@@ -1,50 +1,50 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o: \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/flow/SinglePacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o
index bcf9bb4b..6845c360 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
index 4d87a49b..f95be5c1 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o: \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.c \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o
index 73c2abd8..ee54f05b 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
index 83b34793..5e821eae 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o: \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.c \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o
index 9ba0fef4..15f89e87 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
index a9510b63..7e452ef8 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
@@ -1,80 +1,80 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o: \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.c \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.c \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o
index 8acc09b9..c2db1142 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
index 834057c8..e7363f5a 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
@@ -1,56 +1,56 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o: \
-  jni/../../../../external/badvpn/lwip/custom/sys.c \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h
+  jni\..\..\..\..\external\badvpn\lwip\custom\sys.c \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o
index 6d089667..c44f39dc 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
index 7ebd0edf..8c287be4 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
@@ -1,47 +1,47 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o: \
-  jni/../../../../external/badvpn/lwip/src/core/def.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\def.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o
index 44220a8c..243e66eb 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
index 788f750b..fe18a270 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
@@ -1,65 +1,65 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o: \
-  jni/../../../../external/badvpn/lwip/src/core/inet_chksum.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\inet_chksum.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o
index 54876e5d..95686f67 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
index a5a871b1..d6a3f9b6 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
@@ -1,146 +1,146 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o: \
-  jni/../../../../external/badvpn/lwip/src/core/init.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/init.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sockets.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\init.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sockets.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/init.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sockets.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sockets.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o
index 75407c93..899b2331 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
index dbe81728..80510709 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/autoip.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\autoip.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o
index 30240774..40521251 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
index b1d8c058..19ca6e2e 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
@@ -1,98 +1,98 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/icmp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\icmp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o
index 7b08657b..9f1b4349 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
index b713a864..0b5a54d4 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/igmp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\igmp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o
index c41031e1..71ce9230 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
index 7b10fde1..87b86092 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
@@ -1,125 +1,125 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip4.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip4.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o
index b7be4ee1..835cd67c 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
index 880cd450..25cc9974 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
@@ -1,65 +1,65 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip4_addr.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip4_addr.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o
index c7bbb18b..61c0be15 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
index 0ee398a8..1646e702 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
@@ -1,101 +1,101 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip_frag.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip_frag.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o
index a2df6a93..71e11988 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
index 4a394e66..ef586da3 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/dhcp6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\dhcp6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o
index f3e9c6db..4e8e98ab 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
index 91e24e05..95f56849 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ethip6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ethip6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o
index 71a4e33a..0226f658 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
index 2b0cb158..14c32b3d 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
@@ -1,98 +1,98 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/icmp6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\icmp6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o
index f0872b10..1975cd30 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
index d922ad16..f12f0b8e 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/inet6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\inet6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o
index 44ee17a1..11d0f64b 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
index 8a26675b..69fb5bb1 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
@@ -1,116 +1,116 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\dhcp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\dhcp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o
index 88610d3d..db4ded17 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
index ea2e18e8..196c9194 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
@@ -1,50 +1,50 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6_addr.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6_addr.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o
index 31d897d6..ba83d89a 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
index fae048de..0fb33736 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
@@ -1,95 +1,95 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6_frag.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6_frag.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o
index 3e84a687..e4cac332 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
index 6fb30bcf..4a430b3d 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/mld6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\mld6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o
index 2afde5e6..d3c39e83 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
index 536d6328..0b34b5ad 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
@@ -1,98 +1,98 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/nd6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\nd6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o
index 4e3d5bbc..e91c2977 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
index 4becd838..5a35c473 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o: \
-  jni/../../../../external/badvpn/lwip/src/core/mem.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\mem.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o
index 052f769c..d750ac37 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
index 002e2720..9d61c050 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
@@ -1,152 +1,152 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/memp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/ppp_oe.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\memp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\ppp_oe.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/ppp_oe.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\ppp_oe.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o
index 2600d14f..6c5888ad 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
index 292bf42b..167cfb83 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
@@ -1,107 +1,107 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o: \
-  jni/../../../../external/badvpn/lwip/src/core/netif.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\netif.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o
index 335317b0..bbcbaf52 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
index d8c8ddc8..f24bccac 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
@@ -1,104 +1,104 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o: \
-  jni/../../../../external/badvpn/lwip/src/core/pbuf.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\pbuf.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o
index 102b2b57..46fee0c2 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
index 6141d9c1..6c103157 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
@@ -1,59 +1,59 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o: \
-  jni/../../../../external/badvpn/lwip/src/core/stats.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\stats.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o
index df8d3c55..e224677e 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
index 7617f161..97d479e8 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
@@ -1,104 +1,104 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o
index 1d82f6fd..97804377 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
index 91886fbe..b5544e98 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
@@ -1,110 +1,110 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp_in.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp_in.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o
index e8a2300e..9b060af4 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
index 773af2a3..c95c81c9 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
@@ -1,104 +1,104 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp_out.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp_out.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o
index 805ca79c..ab80251a 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
index 2d7c7852..2940a153 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
@@ -1,131 +1,131 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o: \
-  jni/../../../../external/badvpn/lwip/src/core/timers.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\timers.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o
index 72a28521..cf45a758 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
index f9e4ca01..2c142bd8 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/udp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\udp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o
index e0ae9fc8..2b200cb4 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
index 19589d64..4e6cbf87 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
@@ -1,134 +1,134 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o: \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.c \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BSocksClient.h
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.c \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BSocksClient.h
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BSocksClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BSocksClient.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o
index 6545e966..f59122d6 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
index 202079af..833e43f1 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
@@ -1,116 +1,116 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o: \
-  jni/../../../../external/badvpn/system/BConnection_unix.c \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/misc/strdup.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BConnection.h
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.c \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\misc\strdup.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BConnection.h
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/misc/strdup.h:
+jni\..\..\..\..\external\badvpn\misc\strdup.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BConnection.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BConnection.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o
index 0f1a46ea..6935db4f 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
index f27b907a..56f748fd 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
@@ -1,113 +1,113 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o: \
-  jni/../../../../external/badvpn/system/BDatagram_unix.c \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BDatagram.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BDatagram_unix.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BDatagram.h
+  jni\..\..\..\..\external\badvpn\system\BDatagram_unix.c \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BDatagram.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BDatagram_unix.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BDatagram.h
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BDatagram.h:
+jni\..\..\..\..\external\badvpn\system\BDatagram.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BDatagram_unix.h:
+jni\..\..\..\..\external\badvpn\system\BDatagram_unix.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BDatagram.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BDatagram.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o
index 3608f67c..c14ef7f0 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
index 028ed4ca..28d4b32b 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
@@ -1,26 +1,26 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o: \
-  jni/../../../../external/badvpn/system/BNetwork.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BNetwork.h
+  jni\..\..\..\..\external\badvpn\system\BNetwork.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BNetwork.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BNetwork.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BNetwork.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o
index 351adf97..c93af10e 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
index e00f6f7c..8df56920 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
@@ -1,95 +1,95 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o: \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BReactor.h \
-  jni/../../../../external/badvpn/structure/CAvl_impl.h
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BReactor.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BReactor.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BReactor.h:
 
-jni/../../../../external/badvpn/structure/CAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o
index 434c9e32..2106faca 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
index a46f73a8..8fe11bb4 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
@@ -1,83 +1,83 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o: \
-  jni/../../../../external/badvpn/system/BSignal.c \
-  jni/../../../../external/badvpn/system/BUnixSignal.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BSignal.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BSignal.h
+  jni\..\..\..\..\external\badvpn\system\BSignal.c \
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BSignal.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BSignal.h
 
-jni/../../../../external/badvpn/system/BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\system\BUnixSignal.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BSignal.h:
+jni\..\..\..\..\external\badvpn\system\BSignal.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BSignal.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BSignal.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o
index 02e46bd9..e46b28c2 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
index 31c7553b..1c204664 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
@@ -1,29 +1,29 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o: \
-  jni/../../../../external/badvpn/system/BTime.c \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h
+  jni\..\..\..\..\external\badvpn\system\BTime.c \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o
index 4bac0713..81a542f2 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
index 8d0fef16..f10a6bd2 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
@@ -1,92 +1,92 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o: \
-  jni/../../../../external/badvpn/system/BUnixSignal.c \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BUnixSignal.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BUnixSignal.h
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.c \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BUnixSignal.h
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\system\BUnixSignal.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BUnixSignal.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o
index e663b854..84909849 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
index e2404643..04dd3b78 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
@@ -1,194 +1,194 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o: \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/generated/blog_channel_SocksUdpGwClient.h
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_SocksUdpGwClient.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_SocksUdpGwClient.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o
index 97689dd2..4cf195ad 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
index 7aa9777d..e38c57f7 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
@@ -1,329 +1,329 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o: \
-  jni/../../../../external/badvpn/tun2socks/tun2socks.c \
-  jni/../../../../external/badvpn/misc/version.h \
-  jni/../../../../external/badvpn/misc/loggers_string.h \
-  jni/../../../../external/badvpn/misc/loglevel.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/dead.h \
-  jni/../../../../external/badvpn/misc/ipv4_proto.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/ipv6_proto.h \
-  jni/../../../../external/badvpn/misc/udp_proto.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/open_standard_streams.h \
-  jni/../../../../external/badvpn/misc/read_file.h \
-  jni/../../../../external/badvpn/misc/ipaddr6.h \
-  jni/../../../../external/badvpn/misc/parse_number.h \
-  jni/../../../../external/badvpn/misc/cstring.h \
-  jni/../../../../external/badvpn/misc/find_char.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/concat_strings.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BSignal.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/tuntap/BTap.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/init.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/base/BLog_syslog.h \
-  jni/../../../../external/badvpn/tun2socks/tun2socks.h \
-  jni/../../../../external/badvpn/generated/blog_channel_tun2socks.h \
-  jni/libancillary/ancillary.h
+  jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.c \
+  jni\..\..\..\..\external\badvpn\misc\version.h \
+  jni\..\..\..\..\external\badvpn\misc\loggers_string.h \
+  jni\..\..\..\..\external\badvpn\misc\loglevel.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\dead.h \
+  jni\..\..\..\..\external\badvpn\misc\ipv4_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\ipv6_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\udp_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\open_standard_streams.h \
+  jni\..\..\..\..\external\badvpn\misc\read_file.h \
+  jni\..\..\..\..\external\badvpn\misc\ipaddr6.h \
+  jni\..\..\..\..\external\badvpn\misc\parse_number.h \
+  jni\..\..\..\..\external\badvpn\misc\cstring.h \
+  jni\..\..\..\..\external\badvpn\misc\find_char.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\concat_strings.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BSignal.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_tun2socks.h \
+  jni\libancillary\ancillary.h
 
-jni/../../../../external/badvpn/misc/version.h:
+jni\..\..\..\..\external\badvpn\misc\version.h:
 
-jni/../../../../external/badvpn/misc/loggers_string.h:
+jni\..\..\..\..\external\badvpn\misc\loggers_string.h:
 
-jni/../../../../external/badvpn/misc/loglevel.h:
+jni\..\..\..\..\external\badvpn\misc\loglevel.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/dead.h:
+jni\..\..\..\..\external\badvpn\misc\dead.h:
 
-jni/../../../../external/badvpn/misc/ipv4_proto.h:
+jni\..\..\..\..\external\badvpn\misc\ipv4_proto.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/ipv6_proto.h:
+jni\..\..\..\..\external\badvpn\misc\ipv6_proto.h:
 
-jni/../../../../external/badvpn/misc/udp_proto.h:
+jni\..\..\..\..\external\badvpn\misc\udp_proto.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/open_standard_streams.h:
+jni\..\..\..\..\external\badvpn\misc\open_standard_streams.h:
 
-jni/../../../../external/badvpn/misc/read_file.h:
+jni\..\..\..\..\external\badvpn\misc\read_file.h:
 
-jni/../../../../external/badvpn/misc/ipaddr6.h:
+jni\..\..\..\..\external\badvpn\misc\ipaddr6.h:
 
-jni/../../../../external/badvpn/misc/parse_number.h:
+jni\..\..\..\..\external\badvpn\misc\parse_number.h:
 
-jni/../../../../external/badvpn/misc/cstring.h:
+jni\..\..\..\..\external\badvpn\misc\cstring.h:
 
-jni/../../../../external/badvpn/misc/find_char.h:
+jni\..\..\..\..\external\badvpn\misc\find_char.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/concat_strings.h:
+jni\..\..\..\..\external\badvpn\misc\concat_strings.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BSignal.h:
+jni\..\..\..\..\external\badvpn\system\BSignal.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/flow/SinglePacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/tuntap/BTap.h:
+jni\..\..\..\..\external\badvpn\tuntap\BTap.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/init.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/base/BLog_syslog.h:
+jni\..\..\..\..\external\badvpn\base\BLog_syslog.h:
 
-jni/../../../../external/badvpn/tun2socks/tun2socks.h:
+jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_tun2socks.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_tun2socks.h:
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o
index 544133d4..60a61258 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
index b40d6174..d084707c 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
@@ -1,86 +1,86 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o: \
-  jni/../../../../external/badvpn/tuntap/BTap.c \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/tuntap/BTap.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTap.h
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.c \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTap.h
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/tuntap/BTap.h:
+jni\..\..\..\..\external\badvpn\tuntap\BTap.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTap.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTap.h:
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o
index 72628fbb..9017ce30 100644
Binary files a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o and b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o differ
diff --git a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
index af10e55a..7ce37037 100644
--- a/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
+++ b/orbotmanager/src/main/obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
@@ -1,176 +1,176 @@
 ./obj/local/x86/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o: \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.c \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/generated/blog_channel_UdpGwClient.h
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.c \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_UdpGwClient.h
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_UdpGwClient.h:
diff --git a/orbotmanager/src/main/obj/local/x86/pdnsd b/orbotmanager/src/main/obj/local/x86/pdnsd
index e99ccb4b..3eafc1ff 100644
Binary files a/orbotmanager/src/main/obj/local/x86/pdnsd and b/orbotmanager/src/main/obj/local/x86/pdnsd differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/libancillary.a b/orbotmanager/src/main/obj/local/x86_64/libancillary.a
index cf0be8bd..b06c6fd8 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/libancillary.a and b/orbotmanager/src/main/obj/local/x86_64/libancillary.a differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/libtun2socks.so b/orbotmanager/src/main/obj/local/x86_64/libtun2socks.so
index 9dc00910..24aa5dba 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/libtun2socks.so and b/orbotmanager/src/main/obj/local/x86_64/libtun2socks.so differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_recv.o b/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_recv.o
index c420002c..cc1de183 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_recv.o and b/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_recv.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_recv.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_recv.o.d
index a16b8f0e..d3e67ed0 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_recv.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_recv.o.d
@@ -1,4 +1,4 @@
 ./obj/local/x86_64/objs/ancillary/libancillary/fd_recv.o: \
-  jni/libancillary/fd_recv.c jni/libancillary/ancillary.h
+  jni\libancillary\fd_recv.c jni\libancillary\ancillary.h
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_send.o b/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_send.o
index 88a0677c..88e03643 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_send.o and b/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_send.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_send.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_send.o.d
index d267f435..d8c72024 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_send.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/ancillary/libancillary/fd_send.o.d
@@ -1,4 +1,4 @@
 ./obj/local/x86_64/objs/ancillary/libancillary/fd_send.o: \
-  jni/libancillary/fd_send.c jni/libancillary/ancillary.h
+  jni\libancillary\fd_send.c jni\libancillary\ancillary.h
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/cache.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/cache.o
index 3dcd3aec..991c1b11 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/cache.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/cache.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/cache.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/cache.o.d
index df6e7e29..77b66c8e 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/cache.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/cache.o.d
@@ -1,32 +1,32 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/cache.o: jni/pdnsd/src/cache.c \
-  jni/pdnsd/config.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/hash.h jni/pdnsd/src/helpers.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/thread.h jni/pdnsd/src/debug.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/cache.o: jni\pdnsd\src\cache.c \
+  jni\pdnsd\config.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\hash.h jni\pdnsd\src\helpers.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\thread.h jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conf-parser.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conf-parser.o
index 8b7c642d..97fd8393 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conf-parser.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conf-parser.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conf-parser.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conf-parser.o.d
index 20b27d3d..28043c1c 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conf-parser.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conf-parser.o.d
@@ -1,33 +1,33 @@
 ./obj/local/x86_64/objs/pdnsd/pdnsd/src/conf-parser.o: \
-  jni/pdnsd/src/conf-parser.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/conff.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/conf-keywords.h \
-  jni/pdnsd/src/conf-parser.h
+  jni\pdnsd\src\conf-parser.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\conff.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\conf-keywords.h \
+  jni\pdnsd\src\conf-parser.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/conf-keywords.h:
+jni\pdnsd\src\conf-keywords.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conff.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conff.o
index 9fa5e00a..a21784e4 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conff.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conff.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conff.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conff.o.d
index 3cb105bf..2cba1eb5 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conff.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/conff.o.d
@@ -1,33 +1,33 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/conff.o: jni/pdnsd/src/conff.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/conff.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conf-parser.h jni/pdnsd/src/servers.h \
-  jni/pdnsd/src/icmp.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/conff.o: jni\pdnsd\src\conff.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\conff.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conf-parser.h jni\pdnsd\src\servers.h \
+  jni\pdnsd\src\icmp.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/consts.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/consts.o
index 3eecea08..0f9064ed 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/consts.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/consts.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/consts.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/consts.o.d
index efd05fd6..33288c11 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/consts.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/consts.o.d
@@ -1,8 +1,8 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/consts.o: jni/pdnsd/src/consts.c \
-  jni/pdnsd/config.h jni/pdnsd/src/consts.h jni/pdnsd/src/rr_types.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/consts.o: jni\pdnsd\src\consts.c \
+  jni\pdnsd\config.h jni\pdnsd\src\consts.h jni\pdnsd\src\rr_types.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/debug.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/debug.o
index dfaaae80..fe3c82e0 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/debug.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/debug.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/debug.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/debug.o.d
index 963dbc40..ac15adf8 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/debug.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/debug.o.d
@@ -1,27 +1,27 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/debug.o: jni/pdnsd/src/debug.c \
-  jni/pdnsd/config.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/debug.o: jni\pdnsd\src\debug.c \
+  jni\pdnsd\config.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns.o
index 188fa236..3f6420d6 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns.o.d
index 94be04e4..1783f748 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns.o.d
@@ -1,27 +1,27 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/dns.o: jni/pdnsd/src/dns.c \
-  jni/pdnsd/config.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/dns.o: jni\pdnsd\src\dns.c \
+  jni\pdnsd\config.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_answer.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_answer.o
index e41050b3..5072877f 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_answer.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_answer.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_answer.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_answer.o.d
index 11e048c1..05ec02b6 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_answer.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_answer.o.d
@@ -1,35 +1,35 @@
 ./obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_answer.o: \
-  jni/pdnsd/src/dns_answer.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/thread.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/dns_answer.h jni/pdnsd/src/dns_query.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/conff.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/debug.h
+  jni\pdnsd\src\dns_answer.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\thread.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\dns_answer.h jni\pdnsd\src\dns_query.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\conff.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_query.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_query.o
index 08e7d388..f7c08efa 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_query.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_query.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_query.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_query.o.d
index 019d96ca..4bcb47dc 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_query.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_query.o.d
@@ -1,40 +1,40 @@
 ./obj/local/x86_64/objs/pdnsd/pdnsd/src/dns_query.o: \
-  jni/pdnsd/src/dns_query.c jni/pdnsd/config.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/dns_query.h jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conff.h jni/pdnsd/src/servers.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/debug.h
+  jni\pdnsd\src\dns_query.c jni\pdnsd\config.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\dns_query.h jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conff.h jni\pdnsd\src\servers.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\debug.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/debug.h:
+jni\pdnsd\src\debug.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/error.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/error.o
index 60520b98..c950a2bb 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/error.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/error.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/error.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/error.o.d
index a1f64928..32e634b2 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/error.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/error.o.d
@@ -1,27 +1,27 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/error.o: jni/pdnsd/src/error.c \
-  jni/pdnsd/config.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/error.o: jni\pdnsd\src\error.c \
+  jni\pdnsd\config.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/hash.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/hash.o
index 3e172b3c..22b8445d 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/hash.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/hash.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/hash.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/hash.o.d
index c0ff5ed0..4c1a3f96 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/hash.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/hash.o.d
@@ -1,32 +1,32 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/hash.o: jni/pdnsd/src/hash.c \
-  jni/pdnsd/config.h jni/pdnsd/src/hash.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/consts.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/hash.o: jni\pdnsd\src\hash.c \
+  jni\pdnsd\config.h jni\pdnsd\src\hash.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\consts.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/helpers.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/helpers.o
index 32c1e557..efd449f0 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/helpers.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/helpers.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/helpers.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/helpers.o.d
index 151e3808..0fb4352e 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/helpers.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/helpers.o.d
@@ -1,27 +1,27 @@
 ./obj/local/x86_64/objs/pdnsd/pdnsd/src/helpers.o: \
-  jni/pdnsd/src/helpers.c jni/pdnsd/config.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/thread.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+  jni\pdnsd\src\helpers.c jni\pdnsd\config.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\thread.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/icmp.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/icmp.o
index 27a9aaff..5a72a6a9 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/icmp.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/icmp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/icmp.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/icmp.o.d
index e8978c61..ec30cb0c 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/icmp.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/icmp.o.d
@@ -1,34 +1,34 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/icmp.o: jni/pdnsd/src/icmp.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/icmp.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/servers.h jni/pdnsd/src/consts.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/icmp.o: jni\pdnsd\src\icmp.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\icmp.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\servers.h jni\pdnsd\src\consts.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/list.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/list.o
index 8fa4059c..c0176e41 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/list.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/list.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/list.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/list.o.d
index eaecb825..76b11e81 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/list.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/list.o.d
@@ -1,27 +1,27 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/list.o: jni/pdnsd/src/list.c \
-  jni/pdnsd/config.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/list.o: jni\pdnsd\src\list.c \
+  jni\pdnsd\config.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/main.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/main.o
index c6c9dd84..c4e62a59 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/main.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/main.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/main.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/main.o.d
index c1a214e7..3535cd28 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/main.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/main.o.d
@@ -1,44 +1,44 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/main.o: jni/pdnsd/src/main.c \
-  jni/pdnsd/config.h jni/pdnsd/src/consts.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/status.h jni/pdnsd/src/servers.h \
-  jni/pdnsd/src/dns_answer.h jni/pdnsd/src/dns_query.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/thread.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/icmp.h jni/pdnsd/src/hash.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/main.o: jni\pdnsd\src\main.c \
+  jni\pdnsd\config.h jni\pdnsd\src\consts.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\status.h jni\pdnsd\src\servers.h \
+  jni\pdnsd\src\dns_answer.h jni\pdnsd\src\dns_query.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\thread.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\icmp.h jni\pdnsd\src\hash.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/status.h:
+jni\pdnsd\src\status.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/hash.h:
+jni\pdnsd\src\hash.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/netdev.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/netdev.o
index f673e62f..265512a1 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/netdev.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/netdev.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/netdev.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/netdev.o.d
index 51f0d0ec..34a0859f 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/netdev.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/netdev.o.d
@@ -1,29 +1,29 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/netdev.o: jni/pdnsd/src/netdev.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/error.h jni/pdnsd/src/thread.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/netdev.o: jni\pdnsd\src\netdev.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\error.h jni\pdnsd\src\thread.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/rr_types.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/rr_types.o
index 637330aa..e859de0a 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/rr_types.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/rr_types.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/rr_types.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/rr_types.o.d
index 9ad77df9..0182a0f4 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/rr_types.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/rr_types.o.d
@@ -1,23 +1,23 @@
 ./obj/local/x86_64/objs/pdnsd/pdnsd/src/rr_types.o: \
-  jni/pdnsd/src/rr_types.c jni/pdnsd/config.h jni/pdnsd/src/helpers.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/list.h jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h \
-  jni/pdnsd/src/conff.h
+  jni\pdnsd\src\rr_types.c jni\pdnsd\config.h jni\pdnsd\src\helpers.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\list.h jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h \
+  jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/servers.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/servers.o
index a3e47732..8bf31933 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/servers.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/servers.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/servers.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/servers.o.d
index 391ee3bd..c9bdbac7 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/servers.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/servers.o.d
@@ -1,39 +1,39 @@
 ./obj/local/x86_64/objs/pdnsd/pdnsd/src/servers.o: \
-  jni/pdnsd/src/servers.c jni/pdnsd/config.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/error.h jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h \
-  jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h \
-  jni/pdnsd/src/servers.h jni/pdnsd/src/consts.h jni/pdnsd/src/icmp.h \
-  jni/pdnsd/src/netdev.h jni/pdnsd/src/dns_query.h
+  jni\pdnsd\src\servers.c jni\pdnsd\config.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\error.h jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h \
+  jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h \
+  jni\pdnsd\src\servers.h jni\pdnsd\src\consts.h jni\pdnsd\src\icmp.h \
+  jni\pdnsd\src\netdev.h jni\pdnsd\src\dns_query.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/icmp.h:
+jni\pdnsd\src\icmp.h:
 
-jni/pdnsd/src/netdev.h:
+jni\pdnsd\src\netdev.h:
 
-jni/pdnsd/src/dns_query.h:
+jni\pdnsd\src\dns_query.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/status.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/status.o
index 387b5ea7..e64197ed 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/status.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/status.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/status.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/status.o.d
index a5610a06..e087cc82 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/status.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/status.o.d
@@ -1,39 +1,39 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/status.o: jni/pdnsd/src/status.c \
-  jni/pdnsd/config.h jni/pdnsd/src/ipvers.h jni/pdnsd/src/rr_types.h \
-  jni/pdnsd/src/status.h jni/pdnsd/src/conff.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/thread.h \
-  jni/pdnsd/src/cache.h jni/pdnsd/src/dns.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/servers.h jni/pdnsd/src/consts.h \
-  jni/pdnsd/src/dns_answer.h jni/pdnsd/src/conf-parser.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/status.o: jni\pdnsd\src\status.c \
+  jni\pdnsd\config.h jni\pdnsd\src\ipvers.h jni\pdnsd\src\rr_types.h \
+  jni\pdnsd\src\status.h jni\pdnsd\src\conff.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\thread.h \
+  jni\pdnsd\src\cache.h jni\pdnsd\src\dns.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\servers.h jni\pdnsd\src\consts.h \
+  jni\pdnsd\src\dns_answer.h jni\pdnsd\src\conf-parser.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/status.h:
+jni\pdnsd\src\status.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/servers.h:
+jni\pdnsd\src\servers.h:
 
-jni/pdnsd/src/consts.h:
+jni\pdnsd\src\consts.h:
 
-jni/pdnsd/src/dns_answer.h:
+jni\pdnsd\src\dns_answer.h:
 
-jni/pdnsd/src/conf-parser.h:
+jni\pdnsd\src\conf-parser.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/thread.o b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/thread.o
index af7ff9cf..3245ad6d 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/thread.o and b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/thread.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/thread.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/thread.o.d
index 7534541a..67f6e47d 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/thread.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/pdnsd/pdnsd/src/thread.o.d
@@ -1,27 +1,27 @@
-./obj/local/x86_64/objs/pdnsd/pdnsd/src/thread.o: jni/pdnsd/src/thread.c \
-  jni/pdnsd/config.h jni/pdnsd/src/thread.h jni/pdnsd/src/error.h \
-  jni/pdnsd/src/helpers.h jni/pdnsd/src/cache.h jni/pdnsd/src/ipvers.h \
-  jni/pdnsd/src/rr_types.h jni/pdnsd/src/list.h \
-  jni/pdnsd/src/pdnsd_assert.h jni/pdnsd/src/dns.h jni/pdnsd/src/conff.h
+./obj/local/x86_64/objs/pdnsd/pdnsd/src/thread.o: jni\pdnsd\src\thread.c \
+  jni\pdnsd\config.h jni\pdnsd\src\thread.h jni\pdnsd\src\error.h \
+  jni\pdnsd\src\helpers.h jni\pdnsd\src\cache.h jni\pdnsd\src\ipvers.h \
+  jni\pdnsd\src\rr_types.h jni\pdnsd\src\list.h \
+  jni\pdnsd\src\pdnsd_assert.h jni\pdnsd\src\dns.h jni\pdnsd\src\conff.h
 
-jni/pdnsd/config.h:
+jni\pdnsd\config.h:
 
-jni/pdnsd/src/thread.h:
+jni\pdnsd\src\thread.h:
 
-jni/pdnsd/src/error.h:
+jni\pdnsd\src\error.h:
 
-jni/pdnsd/src/helpers.h:
+jni\pdnsd\src\helpers.h:
 
-jni/pdnsd/src/cache.h:
+jni\pdnsd\src\cache.h:
 
-jni/pdnsd/src/ipvers.h:
+jni\pdnsd\src\ipvers.h:
 
-jni/pdnsd/src/rr_types.h:
+jni\pdnsd\src\rr_types.h:
 
-jni/pdnsd/src/list.h:
+jni\pdnsd\src\list.h:
 
-jni/pdnsd/src/pdnsd_assert.h:
+jni\pdnsd\src\pdnsd_assert.h:
 
-jni/pdnsd/src/dns.h:
+jni\pdnsd\src\dns.h:
 
-jni/pdnsd/src/conff.h:
+jni\pdnsd\src\conff.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o
index 7b3b8b74..ea1285d5 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
index ec88df77..9eb410e9 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o.d
@@ -1,23 +1,23 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog.o: \
-  jni/../../../../external/badvpn/base/BLog.c \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channels_list.h
+  jni\..\..\..\..\external\badvpn\base\BLog.c \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_list.h
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_list.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_list.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o
index 9de18277..c2de2867 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
index 9547194b..05339cc2 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o.d
@@ -1,23 +1,23 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BLog_syslog.o: \
-  jni/../../../../external/badvpn/base/BLog_syslog.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog_syslog.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog_syslog.h:
+jni\..\..\..\..\external\badvpn\base\BLog_syslog.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o
index b721f4d8..d120fd2e 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
index 1fb1e914..cdbbb4ea 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o.d
@@ -1,38 +1,38 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/BPending.o: \
-  jni/../../../../external/badvpn/base/BPending.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_impl.h
+  jni\..\..\..\..\external\badvpn\base\BPending.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_impl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_impl.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o
index d15153d2..de518c53 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
index 6f2c4663..20ba3ea7 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o.d
@@ -1,11 +1,11 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/base/DebugObject.o: \
-  jni/../../../../external/badvpn/base/DebugObject.c \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h
+  jni\..\..\..\..\external\badvpn\base\DebugObject.c \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o
index e9ce3571..7fc6c3a0 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
index 06a83e87..0f467135 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o.d
@@ -1,38 +1,38 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/BufferWriter.o: \
-  jni/../../../../external/badvpn/flow/BufferWriter.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o
index 9ef71d01..4e4f9d1a 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
index 4a2797dd..0efd61f5 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o.d
@@ -1,56 +1,56 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketBuffer.o: \
-  jni/../../../../external/badvpn/flow/PacketBuffer.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o
index 829f454f..21fa3d47 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
index 74d7973d..745e74dd 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o.d
@@ -1,38 +1,38 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassConnector.o: \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o
index 809d8582..ede11e71 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
index b5c9a0d5..5f048dc8 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o.d
@@ -1,86 +1,86 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassFairQueue.o: \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_impl.h \
-  jni/../../../../external/badvpn/structure/CAvl_impl.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_impl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_impl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o
index 4b390031..82a5d593 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
index fe3b9afb..f04f01de 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketPassInterface.o: \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.c \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o
index 22ecbb49..3f3d7356 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
index 5cd17aae..f8895061 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o.d
@@ -1,65 +1,65 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoDecoder.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_PacketProtoDecoder.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_PacketProtoDecoder.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_PacketProtoDecoder.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o
index b54f80cc..95e29e9b 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
index 28da71a5..8ab416ac 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o.d
@@ -1,50 +1,50 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoEncoder.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.c \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.c \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o
index 2e6c6c72..813e25de 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
index b6b1b66a..89abca9f 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o.d
@@ -1,62 +1,62 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketProtoFlow.o: \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.c \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.c \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o
index c57e2774..3ac5128c 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
index f3f69c57..450d4916 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketRecvInterface.o: \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.c \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o
index 53c879c4..7308df63 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
index c1339aa2..63b67398 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o.d
@@ -1,41 +1,41 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/PacketStreamSender.o: \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o
index 460c835f..0098398c 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
index c2bc2faa..17d18e32 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o.d
@@ -1,50 +1,50 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/SinglePacketBuffer.o: \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/flow/SinglePacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o
index 291c771b..f614cd72 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
index 97a539e7..ac67f88c 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamPassInterface.o: \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.c \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o
index 3f7f435a..f0b566be 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
index 39d1762d..a4e6a21b 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o.d
@@ -1,35 +1,35 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flow/StreamRecvInterface.o: \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.c \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.c \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o
index 79e13071..cdc8669c 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
index 48e4ce50..d09b2553 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o.d
@@ -1,80 +1,80 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/flowextra/PacketPassInactivityMonitor.o: \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.c \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.c \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o
index 6dfb1029..04450a7d 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
index a72d490d..897a49ca 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o.d
@@ -1,56 +1,56 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/custom/sys.o: \
-  jni/../../../../external/badvpn/lwip/custom/sys.c \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h
+  jni\..\..\..\..\external\badvpn\lwip\custom\sys.c \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o
index 055cb0ac..9b08fd69 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
index b0cba184..3db2ed91 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o.d
@@ -1,47 +1,47 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/def.o: \
-  jni/../../../../external/badvpn/lwip/src/core/def.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\def.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o
index 5386c4ce..cd5c6138 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
index 8e381dfb..f86d692c 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o.d
@@ -1,65 +1,65 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/inet_chksum.o: \
-  jni/../../../../external/badvpn/lwip/src/core/inet_chksum.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\inet_chksum.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o
index 9b1cc9fb..218b94fc 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
index 406f510e..80763f81 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o.d
@@ -1,146 +1,146 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/init.o: \
-  jni/../../../../external/badvpn/lwip/src/core/init.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/init.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sockets.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\init.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sockets.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/init.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sockets.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sockets.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o
index 6e41633f..cfc9f7f8 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
index 4e80bbd7..2f4aa9e5 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/autoip.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/autoip.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\autoip.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o
index bcf06776..b4f79d84 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
index 02eb5db0..c6b48037 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o.d
@@ -1,98 +1,98 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/icmp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/icmp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\icmp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o
index caa623d6..e34d78d6 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
index 04ff287e..bc52a5c6 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/igmp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/igmp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\igmp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o
index 2fe53a75..bc54e77e 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
index 427aacd1..84b9dde5 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o.d
@@ -1,125 +1,125 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip4.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip4.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o
index b194738d..690430ba 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
index 3ef1404b..1cce7991 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o.d
@@ -1,65 +1,65 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip4_addr.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip4_addr.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip4_addr.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o
index 7437be9f..afce8587 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
index d1e49b1f..70eaee1c 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o.d
@@ -1,101 +1,101 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv4/ip_frag.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv4/ip_frag.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv4\ip_frag.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o
index c4be4fb9..56f0597c 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
index 1ab3dfb5..cb62bf70 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/dhcp6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/dhcp6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\dhcp6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o
index 95fcdf14..8f445302 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
index 76505c11..89c32e46 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ethip6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ethip6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ethip6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o
index 630062c8..7b449e3a 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
index 57b07a0a..58e3d94b 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o.d
@@ -1,98 +1,98 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/icmp6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/icmp6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\icmp6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o
index 35586642..3105bd84 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
index 40bf57b3..582aaae5 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/inet6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/inet6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\inet6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o
index e0f7e785..7ddf0d9a 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
index e903e6c7..e0822777 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o.d
@@ -1,116 +1,116 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\dhcp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\dhcp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o
index a49eef81..d3bdcd3e 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
index 9719ed02..9e4d9eb2 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o.d
@@ -1,50 +1,50 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_addr.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6_addr.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6_addr.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o
index aa66884d..11ff2a4d 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
index 200f83a5..d33a1bab 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o.d
@@ -1,95 +1,95 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/ip6_frag.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/ip6_frag.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\ip6_frag.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o
index f697c95a..438117ab 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
index 6342756d..5e26227a 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/mld6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/mld6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\mld6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o
index a79be451..f0d1b75e 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
index 49c65a4a..335a307b 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o.d
@@ -1,98 +1,98 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/ipv6/nd6.o: \
-  jni/../../../../external/badvpn/lwip/src/core/ipv6/nd6.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\ipv6\nd6.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o
index a2400190..506dafe3 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
index 39e76879..436c6568 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/mem.o: \
-  jni/../../../../external/badvpn/lwip/src/core/mem.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\mem.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o
index 344383ce..7252a0de 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
index d9c4c6e7..f3943d64 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o.d
@@ -1,152 +1,152 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/memp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/memp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/api_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/ppp_oe.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\memp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\ppp_oe.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/udp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\udp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/raw.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\raw.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/api_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\api_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_structs.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_structs.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp_msg.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp_msg.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/ppp_oe.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\ppp_oe.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o
index 43bffc85..79d0bd1c 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
index f8c7f52b..308c1b15 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o.d
@@ -1,107 +1,107 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/netif.o: \
-  jni/../../../../external/badvpn/lwip/src/core/netif.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\netif.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o
index e5aa577b..95cee7cb 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
index ec3c53c5..9c6235a8 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o.d
@@ -1,104 +1,104 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/pbuf.o: \
-  jni/../../../../external/badvpn/lwip/src/core/pbuf.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\pbuf.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o
index c198e18f..17bfcd7c 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
index 98b5109c..9566c572 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o.d
@@ -1,59 +1,59 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/stats.o: \
-  jni/../../../../external/badvpn/lwip/src/core/stats.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\stats.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o
index c39b8858..0079c1dd 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
index 33427725..6d7835c1 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o.d
@@ -1,104 +1,104 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o
index aed76c55..802e14d4 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
index 3b4f514a..7458b529 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o.d
@@ -1,110 +1,110 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_in.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp_in.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/perf.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp_in.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/perf.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\perf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o
index 524f9c3d..d7b6309c 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
index 4774c34d..a903fa7f 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o.d
@@ -1,104 +1,104 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/tcp_out.o: \
-  jni/../../../../external/badvpn/lwip/src/core/tcp_out.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\tcp_out.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/inet_chksum.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\inet_chksum.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/stats.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\stats.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/snmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\snmp.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o
index 4976e148..04d0a16b 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
index db2220d7..0dedc42d 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o.d
@@ -1,131 +1,131 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/timers.o: \
-  jni/../../../../external/badvpn/lwip/src/core/timers.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\timers.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/timers.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\timers.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/memp_std.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\memp_std.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcpip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcpip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/netif/etharp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\netif\etharp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dhcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dhcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/autoip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\autoip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/igmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\igmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/dns.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\dns.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/nd6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\nd6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_frag.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/mld6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\mld6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/sys.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\sys.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o
index cc5ed045..2ed8cdc2 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
index 59b014b0..aadf370b 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o.d
@@ -1,44 +1,44 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/lwip/src/core/udp.o: \
-  jni/../../../../external/badvpn/lwip/src/core/udp.c \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h
+  jni\..\..\..\..\external\badvpn\lwip\src\core\udp.c \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o
index f714b786..a70916e7 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
index 21804420..02a9f01a 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o.d
@@ -1,134 +1,134 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/socksclient/BSocksClient.o: \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.c \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BSocksClient.h
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.c \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BSocksClient.h
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BSocksClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BSocksClient.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o
index cba61fe2..bd2c0ee5 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
index d8eb2855..46ebf705 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o.d
@@ -1,116 +1,116 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BConnection_unix.o: \
-  jni/../../../../external/badvpn/system/BConnection_unix.c \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/misc/strdup.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BConnection.h
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.c \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\misc\strdup.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BConnection.h
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/misc/strdup.h:
+jni\..\..\..\..\external\badvpn\misc\strdup.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BConnection.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BConnection.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o
index 744b67f2..2c1dcd14 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
index e5850b5c..35708d2e 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o.d
@@ -1,113 +1,113 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BDatagram_unix.o: \
-  jni/../../../../external/badvpn/system/BDatagram_unix.c \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BDatagram.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BDatagram_unix.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BDatagram.h
+  jni\..\..\..\..\external\badvpn\system\BDatagram_unix.c \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BDatagram.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BDatagram_unix.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BDatagram.h
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BDatagram.h:
+jni\..\..\..\..\external\badvpn\system\BDatagram.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BDatagram_unix.h:
+jni\..\..\..\..\external\badvpn\system\BDatagram_unix.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BDatagram.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BDatagram.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o
index 056b9b21..028ad819 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
index 1083239b..c2d05f89 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o.d
@@ -1,26 +1,26 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BNetwork.o: \
-  jni/../../../../external/badvpn/system/BNetwork.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BNetwork.h
+  jni\..\..\..\..\external\badvpn\system\BNetwork.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BNetwork.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BNetwork.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BNetwork.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o
index f531a5e2..5ed0606d 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
index c6d29d78..d0769aa1 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o.d
@@ -1,95 +1,95 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BReactor_badvpn.o: \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BReactor.h \
-  jni/../../../../external/badvpn/structure/CAvl_impl.h
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BReactor.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BReactor.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BReactor.h:
 
-jni/../../../../external/badvpn/structure/CAvl_impl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_impl.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o
index a5539488..ff2c5a83 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
index 42165feb..44715895 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o.d
@@ -1,83 +1,83 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BSignal.o: \
-  jni/../../../../external/badvpn/system/BSignal.c \
-  jni/../../../../external/badvpn/system/BUnixSignal.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BSignal.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BSignal.h
+  jni\..\..\..\..\external\badvpn\system\BSignal.c \
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BSignal.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BSignal.h
 
-jni/../../../../external/badvpn/system/BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\system\BUnixSignal.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BSignal.h:
+jni\..\..\..\..\external\badvpn\system\BSignal.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BSignal.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BSignal.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o
index 0b927ae7..7b229661 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
index 6c8017c1..7721af91 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o.d
@@ -1,29 +1,29 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BTime.o: \
-  jni/../../../../external/badvpn/system/BTime.c \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h
+  jni\..\..\..\..\external\badvpn\system\BTime.c \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o
index d09213c1..da3c81b9 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
index 5b5cf3c6..d03eed5d 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o.d
@@ -1,92 +1,92 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/system/BUnixSignal.o: \
-  jni/../../../../external/badvpn/system/BUnixSignal.c \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/nonblocking.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/system/BUnixSignal.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BUnixSignal.h
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.c \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\nonblocking.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\system\BUnixSignal.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BUnixSignal.h
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/nonblocking.h:
+jni\..\..\..\..\external\badvpn\misc\nonblocking.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/system/BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\system\BUnixSignal.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BUnixSignal.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BUnixSignal.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o
index 1613f7a5..4d6e1d14 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
index bd1110b8..21128f98 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o.d
@@ -1,194 +1,194 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/SocksUdpGwClient.o: \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.c \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/generated/blog_channel_SocksUdpGwClient.h
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.c \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_SocksUdpGwClient.h
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_SocksUdpGwClient.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o
index f4ea2bdb..712af5fc 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
index b5fa7029..481aabde 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o.d
@@ -1,329 +1,329 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tun2socks/tun2socks.o: \
-  jni/../../../../external/badvpn/tun2socks/tun2socks.c \
-  jni/../../../../external/badvpn/misc/version.h \
-  jni/../../../../external/badvpn/misc/loggers_string.h \
-  jni/../../../../external/badvpn/misc/loglevel.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/misc/minmax.h \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/dead.h \
-  jni/../../../../external/badvpn/misc/ipv4_proto.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/misc/ipv6_proto.h \
-  jni/../../../../external/badvpn/misc/udp_proto.h \
-  jni/../../../../external/badvpn/misc/balloc.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/maxalign.h \
-  jni/../../../../external/badvpn/misc/open_standard_streams.h \
-  jni/../../../../external/badvpn/misc/read_file.h \
-  jni/../../../../external/badvpn/misc/ipaddr6.h \
-  jni/../../../../external/badvpn/misc/parse_number.h \
-  jni/../../../../external/badvpn/misc/cstring.h \
-  jni/../../../../external/badvpn/misc/find_char.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/concat_strings.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/system/BSignal.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/system/BNetwork.h \
-  jni/../../../../external/badvpn/flow/SinglePacketBuffer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/socksclient/BSocksClient.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/misc/socks_proto.h \
-  jni/../../../../external/badvpn/system/BConnection.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/system/BConnection_unix.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/tuntap/BTap.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/init.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h \
-  jni/../../../../external/badvpn/lwip/custom/lwipopts.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h \
-  jni/../../../../external/badvpn/lwip/custom/arch/cc.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/err.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/def.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h \
-  jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h \
-  jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h \
-  jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/base/BLog_syslog.h \
-  jni/../../../../external/badvpn/tun2socks/tun2socks.h \
-  jni/../../../../external/badvpn/generated/blog_channel_tun2socks.h \
-  jni/libancillary/ancillary.h
+  jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.c \
+  jni\..\..\..\..\external\badvpn\misc\version.h \
+  jni\..\..\..\..\external\badvpn\misc\loggers_string.h \
+  jni\..\..\..\..\external\badvpn\misc\loglevel.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\misc\minmax.h \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\dead.h \
+  jni\..\..\..\..\external\badvpn\misc\ipv4_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\misc\ipv6_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\udp_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\balloc.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\maxalign.h \
+  jni\..\..\..\..\external\badvpn\misc\open_standard_streams.h \
+  jni\..\..\..\..\external\badvpn\misc\read_file.h \
+  jni\..\..\..\..\external\badvpn\misc\ipaddr6.h \
+  jni\..\..\..\..\external\badvpn\misc\parse_number.h \
+  jni\..\..\..\..\external\badvpn\misc\cstring.h \
+  jni\..\..\..\..\external\badvpn\misc\find_char.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\concat_strings.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BSignal.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\system\BNetwork.h \
+  jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\misc\socks_proto.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\system\BConnection_unix.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h \
+  jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h \
+  jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\base\BLog_syslog.h \
+  jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_tun2socks.h \
+  jni\libancillary\ancillary.h
 
-jni/../../../../external/badvpn/misc/version.h:
+jni\..\..\..\..\external\badvpn\misc\version.h:
 
-jni/../../../../external/badvpn/misc/loggers_string.h:
+jni\..\..\..\..\external\badvpn\misc\loggers_string.h:
 
-jni/../../../../external/badvpn/misc/loglevel.h:
+jni\..\..\..\..\external\badvpn\misc\loglevel.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/misc/minmax.h:
+jni\..\..\..\..\external\badvpn\misc\minmax.h:
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/dead.h:
+jni\..\..\..\..\external\badvpn\misc\dead.h:
 
-jni/../../../../external/badvpn/misc/ipv4_proto.h:
+jni\..\..\..\..\external\badvpn\misc\ipv4_proto.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/misc/ipv6_proto.h:
+jni\..\..\..\..\external\badvpn\misc\ipv6_proto.h:
 
-jni/../../../../external/badvpn/misc/udp_proto.h:
+jni\..\..\..\..\external\badvpn\misc\udp_proto.h:
 
-jni/../../../../external/badvpn/misc/balloc.h:
+jni\..\..\..\..\external\badvpn\misc\balloc.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/maxalign.h:
+jni\..\..\..\..\external\badvpn\misc\maxalign.h:
 
-jni/../../../../external/badvpn/misc/open_standard_streams.h:
+jni\..\..\..\..\external\badvpn\misc\open_standard_streams.h:
 
-jni/../../../../external/badvpn/misc/read_file.h:
+jni\..\..\..\..\external\badvpn\misc\read_file.h:
 
-jni/../../../../external/badvpn/misc/ipaddr6.h:
+jni\..\..\..\..\external\badvpn\misc\ipaddr6.h:
 
-jni/../../../../external/badvpn/misc/parse_number.h:
+jni\..\..\..\..\external\badvpn\misc\parse_number.h:
 
-jni/../../../../external/badvpn/misc/cstring.h:
+jni\..\..\..\..\external\badvpn\misc\cstring.h:
 
-jni/../../../../external/badvpn/misc/find_char.h:
+jni\..\..\..\..\external\badvpn\misc\find_char.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/concat_strings.h:
+jni\..\..\..\..\external\badvpn\misc\concat_strings.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/system/BSignal.h:
+jni\..\..\..\..\external\badvpn\system\BSignal.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/system/BNetwork.h:
+jni\..\..\..\..\external\badvpn\system\BNetwork.h:
 
-jni/../../../../external/badvpn/flow/SinglePacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\SinglePacketBuffer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/socksclient/BSocksClient.h:
+jni\..\..\..\..\external\badvpn\socksclient\BSocksClient.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/misc/socks_proto.h:
+jni\..\..\..\..\external\badvpn\misc\socks_proto.h:
 
-jni/../../../../external/badvpn/system/BConnection.h:
+jni\..\..\..\..\external\badvpn\system\BConnection.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/system/BConnection_unix.h:
+jni\..\..\..\..\external\badvpn\system\BConnection_unix.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/tuntap/BTap.h:
+jni\..\..\..\..\external\badvpn\tuntap\BTap.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/init.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\init.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/opt.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\opt.h:
 
-jni/../../../../external/badvpn/lwip/custom/lwipopts.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\lwipopts.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/debug.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\debug.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/arch.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\arch.h:
 
-jni/../../../../external/badvpn/lwip/custom/arch/cc.h:
+jni\..\..\..\..\external\badvpn\lwip\custom\arch\cc.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp_impl.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp_impl.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/tcp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\tcp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/mem.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\mem.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/pbuf.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\pbuf.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/err.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\err.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/def.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\def.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/ip_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\ip_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6_addr.h:
 
-jni/../../../../external/badvpn/lwip/src/include/lwip/netif.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\lwip\netif.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/ip4.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\ip4.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/ip6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\ip6.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv4/lwip/icmp.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv4\lwip\icmp.h:
 
-jni/../../../../external/badvpn/lwip/src/include/ipv6/lwip/icmp6.h:
+jni\..\..\..\..\external\badvpn\lwip\src\include\ipv6\lwip\icmp6.h:
 
-jni/../../../../external/badvpn/tun2socks/SocksUdpGwClient.h:
+jni\..\..\..\..\external\badvpn\tun2socks\SocksUdpGwClient.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/base/BLog_syslog.h:
+jni\..\..\..\..\external\badvpn\base\BLog_syslog.h:
 
-jni/../../../../external/badvpn/tun2socks/tun2socks.h:
+jni\..\..\..\..\external\badvpn\tun2socks\tun2socks.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_tun2socks.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_tun2socks.h:
 
-jni/libancillary/ancillary.h:
+jni\libancillary\ancillary.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o
index 7fc5ec3b..07035c96 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
index a6a2003f..87cd28c1 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o.d
@@ -1,86 +1,86 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/tuntap/BTap.o: \
-  jni/../../../../external/badvpn/tuntap/BTap.c \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/tuntap/BTap.h \
-  jni/../../../../external/badvpn/misc/debugerror.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTap.h
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.c \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\tuntap\BTap.h \
+  jni\..\..\..\..\external\badvpn\misc\debugerror.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTap.h
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/tuntap/BTap.h:
+jni\..\..\..\..\external\badvpn\tuntap\BTap.h:
 
-jni/../../../../external/badvpn/misc/debugerror.h:
+jni\..\..\..\..\external\badvpn\misc\debugerror.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTap.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTap.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o
index c2469b15..8052d3e2 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o and b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o differ
diff --git a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
index 14c0b969..f28084ed 100644
--- a/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
+++ b/orbotmanager/src/main/obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o.d
@@ -1,176 +1,176 @@
 ./obj/local/x86_64/objs/tun2socks/__/__/__/__/external/badvpn/udpgw_client/UdpGwClient.o: \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.c \
-  jni/../../../../external/badvpn/misc/offset.h \
-  jni/../../../../external/badvpn/misc/byteorder.h \
-  jni/../../../../external/badvpn/misc/compare.h \
-  jni/../../../../external/badvpn/base/BLog.h \
-  jni/../../../../external/badvpn/misc/debug.h \
-  jni/../../../../external/badvpn/base/BMutex.h \
-  jni/../../../../external/badvpn/base/DebugObject.h \
-  jni/../../../../external/badvpn/misc/debugcounter.h \
-  jni/../../../../external/badvpn/generated/blog_channels_defines.h \
-  jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h \
-  jni/../../../../external/badvpn/protocol/udpgw_proto.h \
-  jni/../../../../external/badvpn/misc/bsize.h \
-  jni/../../../../external/badvpn/misc/packed.h \
-  jni/../../../../external/badvpn/structure/BAVL.h \
-  jni/../../../../external/badvpn/structure/LinkedList1.h \
-  jni/../../../../external/badvpn/system/BAddr.h \
-  jni/../../../../external/badvpn/misc/print_macros.h \
-  jni/../../../../external/badvpn/misc/read_write_int.h \
-  jni/../../../../external/badvpn/base/BPending.h \
-  jni/../../../../external/badvpn/structure/SLinkedList.h \
-  jni/../../../../external/badvpn/misc/merge.h \
-  jni/../../../../external/badvpn/base/BPending_list.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_decl.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_header.h \
-  jni/../../../../external/badvpn/structure/SLinkedList_footer.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue.h \
-  jni/../../../../external/badvpn/structure/SAvl.h \
-  jni/../../../../external/badvpn/structure/CAvl.h \
-  jni/../../../../external/badvpn/flow/PacketPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h \
-  jni/../../../../external/badvpn/structure/SAvl_decl.h \
-  jni/../../../../external/badvpn/structure/SAvl_header.h \
-  jni/../../../../external/badvpn/structure/SAvl_tree.h \
-  jni/../../../../external/badvpn/structure/CAvl_decl.h \
-  jni/../../../../external/badvpn/structure/CAvl_header.h \
-  jni/../../../../external/badvpn/structure/CAvl_footer.h \
-  jni/../../../../external/badvpn/structure/SAvl_footer.h \
-  jni/../../../../external/badvpn/flow/PacketStreamSender.h \
-  jni/../../../../external/badvpn/flow/StreamPassInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoFlow.h \
-  jni/../../../../external/badvpn/flow/BufferWriter.h \
-  jni/../../../../external/badvpn/flow/PacketRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketProtoEncoder.h \
-  jni/../../../../external/badvpn/flow/PacketBuffer.h \
-  jni/../../../../external/badvpn/structure/ChunkBuffer2.h \
-  jni/../../../../external/badvpn/misc/balign.h \
-  jni/../../../../external/badvpn/flow/PacketProtoDecoder.h \
-  jni/../../../../external/badvpn/protocol/packetproto.h \
-  jni/../../../../external/badvpn/flow/StreamRecvInterface.h \
-  jni/../../../../external/badvpn/flow/PacketPassConnector.h \
-  jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h \
-  jni/../../../../external/badvpn/system/BReactor.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn.h \
-  jni/../../../../external/badvpn/system/BTime.h \
-  jni/../../../../external/badvpn/misc/overflow.h \
-  jni/../../../../external/badvpn/generated/blog_channel_BTime.h \
-  jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h \
-  jni/../../../../external/badvpn/generated/blog_channel_UdpGwClient.h
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.c \
+  jni\..\..\..\..\external\badvpn\misc\offset.h \
+  jni\..\..\..\..\external\badvpn\misc\byteorder.h \
+  jni\..\..\..\..\external\badvpn\misc\compare.h \
+  jni\..\..\..\..\external\badvpn\base\BLog.h \
+  jni\..\..\..\..\external\badvpn\misc\debug.h \
+  jni\..\..\..\..\external\badvpn\base\BMutex.h \
+  jni\..\..\..\..\external\badvpn\base\DebugObject.h \
+  jni\..\..\..\..\external\badvpn\misc\debugcounter.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h \
+  jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h \
+  jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h \
+  jni\..\..\..\..\external\badvpn\misc\bsize.h \
+  jni\..\..\..\..\external\badvpn\misc\packed.h \
+  jni\..\..\..\..\external\badvpn\structure\BAVL.h \
+  jni\..\..\..\..\external\badvpn\structure\LinkedList1.h \
+  jni\..\..\..\..\external\badvpn\system\BAddr.h \
+  jni\..\..\..\..\external\badvpn\misc\print_macros.h \
+  jni\..\..\..\..\external\badvpn\misc\read_write_int.h \
+  jni\..\..\..\..\external\badvpn\base\BPending.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList.h \
+  jni\..\..\..\..\external\badvpn\misc\merge.h \
+  jni\..\..\..\..\external\badvpn\base\BPending_list.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_header.h \
+  jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h \
+  jni\..\..\..\..\external\badvpn\flow\BufferWriter.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h \
+  jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h \
+  jni\..\..\..\..\external\badvpn\misc\balign.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h \
+  jni\..\..\..\..\external\badvpn\protocol\packetproto.h \
+  jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h \
+  jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h \
+  jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h \
+  jni\..\..\..\..\external\badvpn\system\BTime.h \
+  jni\..\..\..\..\external\badvpn\misc\overflow.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h \
+  jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h \
+  jni\..\..\..\..\external\badvpn\generated\blog_channel_UdpGwClient.h
 
-jni/../../../../external/badvpn/misc/offset.h:
+jni\..\..\..\..\external\badvpn\misc\offset.h:
 
-jni/../../../../external/badvpn/misc/byteorder.h:
+jni\..\..\..\..\external\badvpn\misc\byteorder.h:
 
-jni/../../../../external/badvpn/misc/compare.h:
+jni\..\..\..\..\external\badvpn\misc\compare.h:
 
-jni/../../../../external/badvpn/base/BLog.h:
+jni\..\..\..\..\external\badvpn\base\BLog.h:
 
-jni/../../../../external/badvpn/misc/debug.h:
+jni\..\..\..\..\external\badvpn\misc\debug.h:
 
-jni/../../../../external/badvpn/base/BMutex.h:
+jni\..\..\..\..\external\badvpn\base\BMutex.h:
 
-jni/../../../../external/badvpn/base/DebugObject.h:
+jni\..\..\..\..\external\badvpn\base\DebugObject.h:
 
-jni/../../../../external/badvpn/misc/debugcounter.h:
+jni\..\..\..\..\external\badvpn\misc\debugcounter.h:
 
-jni/../../../../external/badvpn/generated/blog_channels_defines.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channels_defines.h:
 
-jni/../../../../external/badvpn/udpgw_client/UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\udpgw_client\UdpGwClient.h:
 
-jni/../../../../external/badvpn/protocol/udpgw_proto.h:
+jni\..\..\..\..\external\badvpn\protocol\udpgw_proto.h:
 
-jni/../../../../external/badvpn/misc/bsize.h:
+jni\..\..\..\..\external\badvpn\misc\bsize.h:
 
-jni/../../../../external/badvpn/misc/packed.h:
+jni\..\..\..\..\external\badvpn\misc\packed.h:
 
-jni/../../../../external/badvpn/structure/BAVL.h:
+jni\..\..\..\..\external\badvpn\structure\BAVL.h:
 
-jni/../../../../external/badvpn/structure/LinkedList1.h:
+jni\..\..\..\..\external\badvpn\structure\LinkedList1.h:
 
-jni/../../../../external/badvpn/system/BAddr.h:
+jni\..\..\..\..\external\badvpn\system\BAddr.h:
 
-jni/../../../../external/badvpn/misc/print_macros.h:
+jni\..\..\..\..\external\badvpn\misc\print_macros.h:
 
-jni/../../../../external/badvpn/misc/read_write_int.h:
+jni\..\..\..\..\external\badvpn\misc\read_write_int.h:
 
-jni/../../../../external/badvpn/base/BPending.h:
+jni\..\..\..\..\external\badvpn\base\BPending.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList.h:
 
-jni/../../../../external/badvpn/misc/merge.h:
+jni\..\..\..\..\external\badvpn\misc\merge.h:
 
-jni/../../../../external/badvpn/base/BPending_list.h:
+jni\..\..\..\..\external\badvpn\base\BPending_list.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_decl.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_header.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_header.h:
 
-jni/../../../../external/badvpn/structure/SLinkedList_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SLinkedList_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue.h:
 
-jni/../../../../external/badvpn/structure/SAvl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl.h:
 
-jni/../../../../external/badvpn/structure/CAvl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl.h:
 
-jni/../../../../external/badvpn/flow/PacketPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassFairQueue_tree.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassFairQueue_tree.h:
 
-jni/../../../../external/badvpn/structure/SAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/SAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_header.h:
 
-jni/../../../../external/badvpn/structure/SAvl_tree.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_tree.h:
 
-jni/../../../../external/badvpn/structure/CAvl_decl.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_decl.h:
 
-jni/../../../../external/badvpn/structure/CAvl_header.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_header.h:
 
-jni/../../../../external/badvpn/structure/CAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\CAvl_footer.h:
 
-jni/../../../../external/badvpn/structure/SAvl_footer.h:
+jni\..\..\..\..\external\badvpn\structure\SAvl_footer.h:
 
-jni/../../../../external/badvpn/flow/PacketStreamSender.h:
+jni\..\..\..\..\external\badvpn\flow\PacketStreamSender.h:
 
-jni/../../../../external/badvpn/flow/StreamPassInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamPassInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoFlow.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoFlow.h:
 
-jni/../../../../external/badvpn/flow/BufferWriter.h:
+jni\..\..\..\..\external\badvpn\flow\BufferWriter.h:
 
-jni/../../../../external/badvpn/flow/PacketRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\PacketRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoEncoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoEncoder.h:
 
-jni/../../../../external/badvpn/flow/PacketBuffer.h:
+jni\..\..\..\..\external\badvpn\flow\PacketBuffer.h:
 
-jni/../../../../external/badvpn/structure/ChunkBuffer2.h:
+jni\..\..\..\..\external\badvpn\structure\ChunkBuffer2.h:
 
-jni/../../../../external/badvpn/misc/balign.h:
+jni\..\..\..\..\external\badvpn\misc\balign.h:
 
-jni/../../../../external/badvpn/flow/PacketProtoDecoder.h:
+jni\..\..\..\..\external\badvpn\flow\PacketProtoDecoder.h:
 
-jni/../../../../external/badvpn/protocol/packetproto.h:
+jni\..\..\..\..\external\badvpn\protocol\packetproto.h:
 
-jni/../../../../external/badvpn/flow/StreamRecvInterface.h:
+jni\..\..\..\..\external\badvpn\flow\StreamRecvInterface.h:
 
-jni/../../../../external/badvpn/flow/PacketPassConnector.h:
+jni\..\..\..\..\external\badvpn\flow\PacketPassConnector.h:
 
-jni/../../../../external/badvpn/flowextra/PacketPassInactivityMonitor.h:
+jni\..\..\..\..\external\badvpn\flowextra\PacketPassInactivityMonitor.h:
 
-jni/../../../../external/badvpn/system/BReactor.h:
+jni\..\..\..\..\external\badvpn\system\BReactor.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn.h:
 
-jni/../../../../external/badvpn/system/BTime.h:
+jni\..\..\..\..\external\badvpn\system\BTime.h:
 
-jni/../../../../external/badvpn/misc/overflow.h:
+jni\..\..\..\..\external\badvpn\misc\overflow.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_BTime.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_BTime.h:
 
-jni/../../../../external/badvpn/system/BReactor_badvpn_timerstree.h:
+jni\..\..\..\..\external\badvpn\system\BReactor_badvpn_timerstree.h:
 
-jni/../../../../external/badvpn/generated/blog_channel_UdpGwClient.h:
+jni\..\..\..\..\external\badvpn\generated\blog_channel_UdpGwClient.h:
diff --git a/orbotmanager/src/main/obj/local/x86_64/pdnsd b/orbotmanager/src/main/obj/local/x86_64/pdnsd
index 4523330d..6c5929ef 100644
Binary files a/orbotmanager/src/main/obj/local/x86_64/pdnsd and b/orbotmanager/src/main/obj/local/x86_64/pdnsd differ