diff --git a/linux/i2pd/i2pd b/linux/i2pd/i2pd
index 9650320..331a513 100755
--- a/linux/i2pd/i2pd
+++ b/linux/i2pd/i2pd
@@ -15,7 +15,7 @@ if [ -z $screenfind ]; then
fi
if [ $arch = "x86_64" ]; then
- screen -Adm -S i2pd ./i2pd-x86_64 --datadir=.
+ screen -Adm -S i2pd ./i2pd-amd64 --datadir=.
else
screen -Adm -S i2pd ./i2pd-i386 --datadir=.
fi
diff --git a/linux/i2pd/i2pd-x86_64 b/linux/i2pd/i2pd-amd64
similarity index 51%
rename from linux/i2pd/i2pd-x86_64
rename to linux/i2pd/i2pd-amd64
index 5731176..1d1c373 100755
Binary files a/linux/i2pd/i2pd-x86_64 and b/linux/i2pd/i2pd-amd64 differ
diff --git a/linux/i2pd/i2pd-i386 b/linux/i2pd/i2pd-i386
index 33ad69f..72f22e5 100755
Binary files a/linux/i2pd/i2pd-i386 and b/linux/i2pd/i2pd-i386 differ
diff --git a/linux/i2pd/i2pd.conf b/linux/i2pd/i2pd.conf
index bc7d026..5a46a78 100644
--- a/linux/i2pd/i2pd.conf
+++ b/linux/i2pd/i2pd.conf
@@ -20,6 +20,9 @@ name = I2Pd
[reseed]
verify = true
+[addressbook]
+subscriptions = http://inr.i2p/export/alive-hosts.txt
+
[http]
enabled = true
address = 127.0.0.1
@@ -38,4 +41,4 @@ port = 4447
[sam]
enabled = true
address = 127.0.0.1
-port = 7656
\ No newline at end of file
+port = 7656
diff --git a/osx/README.md b/osx/README.md
index 08a5276..9c12af9 100644
--- a/osx/README.md
+++ b/osx/README.md
@@ -1,14 +1,23 @@
-## How-to
-NOTE: very very drafty script
+I2Pd Browser Portable builder for MacOS X
+=====
+This is a script-based builder of I2Pd Browser Portable
-run build.sh in one terminal
-run ./i2pd_2.16.0_osx/i2pd in another terminal
+What **MUST** work now (needed test)
+-----
+* Auto detecting system language
+* Pre-configuring Firefox to use with I2Pd
+* Auto downloading NoScript extension
-Open FF-ESR without the use of run.sh, with ./FirefoxESR/Contents/MacOS/firefox --profilemanager
+How to use
+-----
+1. Build pre-configured Firefox using script `build.sh` from `build` folder
+2. Run I2Pd by executing `./i2pd` from `i2pd` folder
+3. Run Firefox by executing `./i2pdbrowser-portable`
-Create a new profile, save it in this ./osx dir and name the profile "i2pdbb". Quit it again.
+Additional info
+-----
+`./i2pd` from `i2pd` folder starts a screen session with i2pd in it.
+To stop the i2pd router you can use the commands `Start graceful shutdown` or `Force shutdown`
+from i2pd webconsole page `http://127.0.0.1:7070/?page=commands`
-Firefox ESR is now configured and i2pd is running. When you want to run FF-ESR now, execute it through the run.sh script.
-
-## TODO:
-Place i2pd addressbook in datadir.
\ No newline at end of file
+SHA512SUMS created with `find * -type f -print0 | xargs -0 -i sha512sum {}` command
diff --git a/osx/build.sh b/osx/build.sh
deleted file mode 100644
index 72010bc..0000000
--- a/osx/build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-version="52.5.2esr"
-
-echo "This script is preparing Firefox ESR $version for use with i2pd"
-echo "Downloading latest Firefox ESR..."
-curl --proto =https -L -f -# https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=en-US
-echo "Attaching image..."
-hdiutil attach ./Firefox\ $version.dmg
-echo "Copying files..."
-cp -rf /Volumes/Firefox/Firefox.app ./FirefoxESR.app
-cp ./syspref.js ./FirefoxESR.app/Contents/Resources/defaults/pref/
-echo "Detaching image and removing image file..."
-hdiutil detach /Volumes/Firefox
-rm ./Firefox\ $version.dmg
-echo "Downloading NoScript extension..."
-curl --proto =https -L -f -# https://secure.informaction.com/download/releases/noscript-5.1.8.2.xpi
-mv ./noscript-5.1.8.2.xpi ./FirefoxESR.app/Contents/Resources/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
-echo "Done."
diff --git a/osx/build/build.sh b/osx/build/build.sh
new file mode 100755
index 0000000..50612f7
--- /dev/null
+++ b/osx/build/build.sh
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Copyright (c) 2013-2017, The PurpleI2P Project
+#
+# This file is part of Purple I2P project and licensed under BSD3
+#
+# See full license text in LICENSE file at top of project tree
+
+arch=$(uname -m)
+language=$(echo $LANG | cut -c-5 | sed s/_/-/g)
+version="52.5.2esr"
+ftpmirror="https://ftp.mozilla.org/pub/firefox/releases/$version"
+
+curlfind=$(which curl)
+if [ -z $curlfind ]; then
+ echo "'cURL' does not seem to be installed. The script needs it!";
+ exit 1;
+fi
+
+echo "This script is preparing Firefox $version for use with I2Pd"
+
+file="Firefox\ $version.dmg"
+filepath="mac/$language/$file"
+
+echo "Downloading $application..."
+curl -L -f -# -O $ftpmirror/$filepath
+if [ $? -ne 0 ]; then # Not found error, trying to cut language variable
+ echo "[TRY 2] I'll try downloading Firefox with shorter language code";
+ language=$(echo $language | cut -c-2)
+ # re-create variable with cutted lang
+ filepath="mac/$language/$file"
+ curl -L -f -# -O $ftpmirror/$filepath
+ if [ $? -ne 0 ]; then # Not found error, trying to download english version
+ echo "[TRY 3] I'll try downloading Firefox with the English language code";
+ language="en_US"
+ # re-create lang variable
+ filepath="mac/$language/$file"
+ curl -L -f -# -O $ftpmirror/$filepath
+ if [ $? -ne 0 ]; then # After that i can say only that user haven't internet connection
+ echo "[Error] Can't download file. Check your internet connectivity."
+ exit 1;
+ fi
+ fi
+fi
+
+if [ ! -f $file ]; then
+ echo "[Error] Can't find downloaded file. Does it really exist?"
+ exit 1;
+fi
+
+echo "Downloading checksum file and checking SHA512 checksum"
+curl -L -f -# -O $ftpmirror/SHA512SUMS
+recv_sum=$(grep "$filepath" SHA512SUMS | cut -c-128)
+file_sum=$(sha512sum $file | cut -c-128)
+if [ $recv_sum != $file_sum ]; then
+ echo "[Error] File checksum failed!"
+ exit 1;
+else
+ echo "Checksum correct."
+ rm SHA512SUMS
+fi
+
+echo "Attaching image and copying files..."
+hdiutil attach $file
+cp -rf /Volumes/Firefox/Firefox.app ../FirefoxESR.app
+mkdir ../data
+
+echo "Detaching image and removing image file..."
+hdiutil detach /Volumes/Firefox
+rm $file
+
+## TODO: check on linux before make that changes
+# Deleting some not needed files
+#rm ../app/crashreporter*
+#rm ../app/removed-files
+#rm ../app/run-mozilla.sh
+#rm ../app/update*
+#rm ../app/browser/blocklist.xml
+#rm -r ../app/dictionaries
+# And edit some places
+#sed -i 's/Enabled=1/Enabled=0/g' ../app/application.ini
+#sed -i 's/ServerURL=.*/ServerURL=-/' ../app/application.ini
+# sed -i 's/Enabled=1/Enabled=0/g' ../app/webapprt/webapprt.ini
+# sed -i 's/ServerURL=.*/ServerURL=-/' ../app/webapprt/webapprt.ini
+# Done!
+
+echo "Downloading NoScript extension..."
+curl -L -f -# -O https://secure.informaction.com/download/releases/noscript-5.1.8.2.xpi
+mv noscript-5.1.8.2.xpi ../FirefoxESR.app/Contents/Resources/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
+
+echo "Adding standard configs..."
+cp profile/* ../data/
+mkdir -p ../FirefoxESR.app/Contents/Resources/browser/defaults
+cp -r preferences ../FirefoxESR.app/Contents/Resources/browser/defaults/
+
+echo '#!/bin/sh' > "../i2pdbrowser-portable"
+echo 'dir=${0%/*}' >> "../i2pdbrowser-portable"
+echo 'if [ "$dir" = "$0" ]; then' >> "../i2pdbrowser-portable"
+echo ' dir="."' >> "../i2pdbrowser-portable"
+echo 'fi' >> "../i2pdbrowser-portable"
+echo 'FirefoxESR.app/Contents/MacOS/firefox -profile ../data -no-remote' >> "../i2pdbrowser-portable"
+
+chmod +x "../i2pdbrowser-portable"
+
+
+echo "... finished"
diff --git a/osx/syspref.js b/osx/build/preferences/syspref.js
similarity index 97%
rename from osx/syspref.js
rename to osx/build/preferences/syspref.js
index b2edd07..8b98d5d 100644
--- a/osx/syspref.js
+++ b/osx/build/preferences/syspref.js
@@ -1,343 +1,343 @@
-# Mozilla User preferences
-
-/*
- * Copyright (c) 2013-2017, The PurpleI2P Project
- *
- * This file is part of Purple i2pd project and licensed under BSD3
- *
- * See full license text in LICENSE file at top of project tree
- */
-
-/* Do not edit this file.
- *
- * If you make changes to this file while the browser is running,
- * the changes will be overwritten when the browser exits.
- *
- * To make a manual change to preferences, you can visit the URL about:config
- * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
- */
-
-pref("app.update.auto", false);
-pref("app.update.channel", "no");
-pref("app.update.enabled", false);
-pref("app.update.interval", 0);
-pref("app.update.service.enabled", false);
-pref("app.update.staging.enabled", false);
-pref("app.update.timer", 0);
-pref("beacon.enabled", false);
-pref("breakpad.reportURL", "");
-pref("browser.aboutHomeSnippets.updateUrl", "");
-pref("browser.cache.disk.capacity", 131072);
-pref("browser.casting.enabled", false);
-pref("browser.crashReports.unsubmittedCheck.enabled", false);
-// pref("browser.display.use_document_fonts", 0);
-pref("browser.download.manager.retention", 0);
-pref("browser.download.useDownloadDir", false);
-pref("browser.feeds.showFirstRunUI", false);
-pref("browser.fixup.alternate.enabled", false);
-pref("browser.fixup.hide_user_pass", true);
-pref("browser.formfill.enable", false);
-// PREF: Delete Search and Form History
-pref("browser.formfill.expire_days", 0);
-// PREF: Delete temporary files on exit
-pref("browser.helperApps.deleteTempFileOnExit", true);
-pref("browser.newtabpage.enhanced", false);
-pref("browser.newtabpage.introShown", true);
-// PREF: Do not create screenshots of visited pages
-pref("browser.pagethumbnails.capturing_disabled", true);
-pref("browser.places.smartBookmarksVersion", -1);
-pref("browser.pocket.enabled", false);
-pref("browser.pocket.useLocaleList", false);
-pref("browser.reader.detectedFirstArticle", false);
-pref("browser.rights.3.shown", true);
-pref("browser.safebrowsing.appRepURL", "");
-pref("browser.safebrowsing.blockedURIs.enabled", false);
-pref("browser.safebrowsing.downloads.enabled", false);
-pref("browser.safebrowsing.downloads.remote.enabled", false);
-pref("browser.safebrowsing.gethashURL", "");
-pref("browser.safebrowsing.keyURL", "localhost");
-pref("browser.safebrowsing.malware.enabled", false);
-pref("browser.safebrowsing.malware.reportURL", "");
-pref("browser.safebrowsing.phishing.enabled", false);
-pref("browser.safebrowsing.provider.google.appRepURL", "");
-pref("browser.safebrowsing.provider.google.gethashURL", "");
-pref("browser.safebrowsing.provider.google.lists", "");
-pref("browser.safebrowsing.provider.google.reportURL", "");
-pref("browser.safebrowsing.provider.google.updateURL", "");
-pref("browser.safebrowsing.provider.mozilla.gethashURL", "");
-pref("browser.safebrowsing.provider.mozilla.lists", "");
-pref("browser.safebrowsing.provider.mozilla.updateURL", "");
-pref("browser.safebrowsing.reportErrorURL", "");
-pref("browser.safebrowsing.reportGenericURL", "");
-pref("browser.safebrowsing.reportMalwareErrorURL", "");
-pref("browser.safebrowsing.reportMalwareURL", "");
-pref("browser.safebrowsing.reportPhishURL", "");
-pref("browser.safebrowsing.reportURL", "");
-pref("browser.safebrowsing.updateURL", "");
-pref("browser.safebrowsing.warning.infoURL", "");
-pref("browser.search.countryCode", "US");
-pref("browser.search.defaultenginename", "DuckDuckGo");
-pref("browser.search.geoSpecificDefaults", false);
-pref("browser.search.geoSpecificDefaults.url", "");
-pref("browser.search.geoip.url", "");
-pref("browser.search.order.1", "DuckDuckGo");
-pref("browser.search.redirectWindowsSearch", false);
-pref("browser.search.region", "US");
-pref("browser.search.searchEnginesURL", "");
-pref("browser.search.suggest.enabled", false);
-pref("browser.search.update", false);
-pref("browser.send_pings", false);
-pref("browser.send_pings.require_same_host", true);
-pref("browser.selfsupport.url", "");
-pref("browser.shell.checkDefaultBrowser", false);
-user_pref("browser.startup.homepage", "http://i2pd.i2p/");
-pref("browser.tabs.closeWindowWithLastTab", false);
-pref("browser.tabs.crashReporting.sendReport", false);
-pref("browser.tabs.loadInBackground", true);
-pref("browser.uitour.enabled", false);
-pref("browser.urlbar.filter.javascript", true);
-pref("browser.urlbar.formatting.enabled", false);
-pref("browser.urlbar.maxRichResults", 12);
-// pref("browser.urlbar.suggest.history", false);
-pref("browser.urlbar.suggest.searches", false);
-pref("browser.urlbar.trimURLs", false);
-pref("browser.usedOnWindows10", false);
-pref("browser.usedOnWindows10.introURL", "");
-pref("camera.control.face_detection.enabled", false);
-pref("canvas.capturestream.enabled", false);
-pref("clipboard.autocopy", false);
-pref("datareporting.healthreport.about.reportUrl", "");
-pref("datareporting.healthreport.about.reportUrlUnified", "");
-pref("datareporting.healthreport.documentServerURI", "");
-pref("datareporting.healthreport.pendingDeleteRemoteData", true);
-pref("datareporting.healthreport.service.enabled", false);
-pref("datareporting.healthreport.service.firstRun", false);
-pref("datareporting.healthreport.uploadEnabled", false);
-pref("datareporting.policy.dataSubmissionEnabled", false);
-pref("datareporting.policy.dataSubmissionEnabled.v2", false);
-pref("datareporting.policy.dataSubmissionPolicyAccepted", false);
-pref("datareporting.policy.dataSubmissionPolicyBypassAcceptance", false);
-pref("datareporting.policy.dataSubmissionPolicyNotifiedTime", "0");
-pref("datareporting.policy.dataSubmissionPolicyResponseType", "accepted-info-bar-dismissed");
-pref("datareporting.policy.dataSubmissionPolicyResponseTime", "0");
-pref("datareporting.policy.firstRunTime", "0");
-pref("datareporting.sessions.current.clean", true);
-pref("device.sensors.enabled", false);
-pref("devtools.chrome.enabled", false);
-pref("devtools.debugger.remote-enabled", false);
-pref("devtools.debugger.force-local", true);
-pref("devtools.webide.enabled", false);
-pref("devtools.webide.autoinstallADBHelper", false);
-pref("devtools.webide.autoinstallFxdtAdapters", false);
-pref("dom.allow_cut_copy", false);
-pref("dom.archivereader.enabled", false);
-pref("dom.battery.enabled", false);
-pref("dom.disable_open_during_load", true);
-pref("dom.enable_performance", false);
-pref("dom.enable_user_timing", false);
-pref("dom.event.clipboardevents.enabled", false);
-pref("dom.flyweb.enabled", false);
-pref("dom.gamepad.enabled", false);
-pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false);
-pref("dom.ipc.plugins.reportCrashURL", false);
-//pref("dom.indexedDB.enabled", false);
-pref("dom.mozTCPSocket.enabled", false);
-pref("dom.netinfo.enabled", false);
-pref("dom.network.enabled", false);
-pref("dom.serviceWorkers.enabled", false);
-pref("dom.telephony.enabled", false);
-pref("dom.vibrator.enabled", false);
-pref("dom.vr.enabled", false);
-pref("dom.webaudio.enabled", false);
-pref("dom.webnotifications.enabled", false);
-pref("dom.workers.enabled", false);
-pref("experiments.supported", false);
-pref("experiments.enabled", false);
-pref("experiments.manifest.uri", "");
-pref("extensions.autoDisableScopes", 0);
-pref("extensions.blocklist.enabled", false);
-pref("extensions.blocklist.url", "");
-pref("extensions.getAddons.cache.enabled", false);
-pref("extensions.getAddons.showPane", false);
-pref("extensions.lazarus.showDonateNotification", false);
-pref("extensions.pocket.enabled", false);
-pref("extensions.shownSelectionUI", true);
-pref("extensions.ui.lastCategory", "addons://list/extension");
-pref("extensions.update.autoUpdateDefault", false);
-pref("extensions.update.enabled", false);
-pref("full-screen-api.approval-required", false);
-pref("full-screen-api.warning.timeout", 0);
-pref("general.buildID.override", "19700101");
-pref("general.warnOnAboutConfig", false);
-pref("geo.enabled", false);
-pref("geo.wifi.uri", "");
-pref("geo.wifi.logging.enabled", false);
-// pref("gfx.font_rendering.opentype_svg.enabled", false);
-pref("intl.locale.matchOS", true);
-// pref("javascript.options.asmjs", false);
-pref("javascript.use_us_english_locale", true);
-pref("keyword.enabled", false);
-pref("lightweightThemes.update.enabled", false);
-pref("media.eme.enabled", false);
-pref("media.getusermedia.screensharing.enabled", false);
-pref("media.getusermedia.audiocapture.enabled", false);
-pref("media.gmp-eme-adobe.enabled", false);
-pref("media.gmp-gmpopenh264.enabled", false);
-pref("media.gmp-gmpopenh264.provider.enabled", false);
-pref("media.gmp-manager.url", "");
-// pref("media.gmp-provider.enabled", false);
-pref("media.navigator.enabled", false);
-pref("media.navigator.video.enabled", false);
-pref("media.peerconnection.enabled", false);
-pref("media.peerconnection.ice.no_host", true);
-pref("media.video_stats.enabled", false);
-pref("media.webspeech.recognition.enable", false);
-pref("media.webspeech.synth.enabled", false);
-pref("network.allow-experiments", false);
-// pref("network.cookie.cookieBehavior", 1);
-// PREF: Cookies expires at the end of the session (when the browser closes)
-// pref("network.cookie.lifetimePolicy", 2);
-pref("network.cookie.prefsMigrated", true);
-// pref("network.cookie.thirdparty.sessionOnly", true);
-// pref("network.dns.blockDotOnion", true);
-pref("network.dns.disableIPv6", true);
-pref("network.dns.disableprefetch", true);
-pref("network.dns.disableprefetchFromHTTPS", true);
-pref("network.dns.disablePrefetch", true);
-pref("network.dns.disablePrefetchFromHTTPS", true);
-// pref("network.http.referer.spoofSource", true);
-// pref("network.http.referer.XOriginPolicy", 2);
-pref("network.http.speculative-parallel-limit", 0);
-pref("network.IDN_show_punycode", true);
-pref("network.jar.open-unsafe-types", false);
-pref("network.manage-offline-status", false);
-pref("network.negotiate-auth.allow-insecure-ntlm-v1", false);
-pref("network.predictor.enabled", false);
-pref("network.prefetch-next", false);
-pref("network.protocol-handler.warn-external-default", true);
-pref("network.protocol-handler.external.http", false);
-pref("network.protocol-handler.external.https", false);
-pref("network.protocol-handler.external.javascript", false);
-pref("network.protocol-handler.external.moz-extension", false);
-pref("network.protocol-handler.external.ftp", false);
-pref("network.protocol-handler.external.file", false);
-pref("network.protocol-handler.external.about", false);
-pref("network.protocol-handler.expose-all", false);
-pref("network.protocol-handler.expose.http", true);
-pref("network.protocol-handler.expose.https", true);
-pref("network.protocol-handler.expose.javascript", true);
-pref("network.protocol-handler.expose.moz-extension", true);
-pref("network.protocol-handler.expose.ftp", true);
-pref("network.protocol-handler.expose.file", true);
-pref("network.protocol-handler.expose.about", true);
-pref("network.proxy.backup.ftp", "127.0.0.1");
-pref("network.proxy.backup.ftp_port", 4444);
-pref("network.proxy.backup.socks", "127.0.0.1");
-pref("network.proxy.backup.socks_port", 4444);
-pref("network.proxy.backup.ssl", "127.0.0.1");
-pref("network.proxy.backup.ssl_port", 4444);
-pref("network.proxy.ftp", "127.0.0.1");
-pref("network.proxy.ftp_port", 4444);
-pref("network.proxy.http", "127.0.0.1");
-pref("network.proxy.http_port", 4444);
-pref("network.proxy.share_proxy_settings", true);
-pref("network.proxy.socks", "127.0.0.1");
-pref("network.proxy.socks_port", 4444);
-pref("network.proxy.socks_remote_dns", true);
-pref("network.proxy.ssl", "127.0.0.1");
-pref("network.proxy.ssl_port", 4444);
-pref("network.proxy.type", 1);
-pref("network.cookie.prefsMigrated", true);
-pref("noscript.ABE.enabled", false);
-pref("noscript.ABE.wanIpAsLocal", false);
-pref("pdfjs.disabled", true);
-pref("pdfjs.enableWebGL", false);
-pref("plugin.default_plugin_disabled", true);
-// pref("plugin.state.flash", 0);
-pref("plugin.state.java", 0);
-pref("plugin.state.libgnome-shell-browser-plugin", 0);
-pref("plugins.click_to_play", true);
-pref("plugins.load_appdir_plugins", false);
-pref("plugins.update.notifyUser", false);
-pref("plugins.update.url", "");
-// PREF: Clear history when Firefox closes
-// pref("privacy.sanitize.sanitizeOnShutdown", true);
-// pref("privacy.clearOnShutdown.cache", true);
-// pref("privacy.clearOnShutdown.cookies", true);
-// pref("privacy.clearOnShutdown.downloads", true);
-// pref("privacy.clearOnShutdown.formdata", true);
-// pref("privacy.clearOnShutdown.history", true);
-// pref("privacy.clearOnShutdown.offlineApps", true);
-// pref("privacy.clearOnShutdown.sessions", true);
-// pref("privacy.clearOnShutdown.openWindows", true);
-pref("privacy.cpd.offlineApps", true);
-pref("privacy.cpd.cache", true);
-pref("privacy.cpd.cookies", true);
-pref("privacy.cpd.downloads", true);
-pref("privacy.cpd.formdata", true);
-pref("privacy.cpd.history", true);
-pref("privacy.cpd.sessions", true);
-pref("privacy.donottrackheader.enabled", true);
-pref("privacy.resistFingerprinting", true);
-pref("privacy.sanitize.timeSpan", 0);
-pref("privacy.trackingprotection.enabled", true);
-pref("privacy.trackingprotection.pbmode.enabled", true);
-pref("privacy.userContext.enabled", true);
-pref("reader.parse-on-load.enabled", false);
-pref("reader.parse-on-load.force-enabled", false);
-pref("security.csp.enable", true);
-pref("security.csp.experimentalEnabled", true);
-pref("security.dialog_enable_delay", 1000);
-pref("security.fileuri.strict_origin_policy", true);
-pref("security.insecure_field_warning.contextual.enabled", false);
-// PREF: Enable insecure password warnings (login forms in non-HTTPS pages)
-pref("security.insecure_password.ui.enabled", false);
-pref("security.mixed_content.block_active_content", true);
-pref("security.mixed_content.block_display_content", true);
-pref("services.blocklist.update_enabled", false);
-pref("security.sri.enable", true);
-pref("security.ssl.errorReporting.automatic", false);
-pref("security.ssl.errorReporting.enabled", false);
-pref("services.sync.enabled", false);
-pref("services.sync.prefs.sync.browser.download.manager.scanWhenDone", false);
-pref("services.sync.prefs.sync.browser.safebrowsing.enabled", false);
-pref("services.sync.prefs.sync.browser.search.update", false);
-pref("services.sync.prefs.sync.extensions.update.enabled", false);
-// pref("shumway.disabled", true);
-pref("signon.autofillForms", false);
-// PREF: Disable password manager
-pref("signon.rememberSignons", false);
-pref("startup.homepage_welcome_url", "about:blank");
-pref("startup.homepage_welcome_url.additional", "about:blank");
-pref("toolkit.telemetry.archive.enabled", false);
-pref("toolkit.telemetry.enabled", false);
-pref("toolkit.telemetry.optoutSample", false);
-pref("toolkit.telemetry.reportingpolicy.firstRun", false);
-pref("toolkit.telemetry.server", "");
-pref("toolkit.telemetry.unified", false);
-pref("toolkit.telemetry.unifiedIsOptIn", true);
-pref("webgl.disabled", true);
-pref("webgl.disable-extensions", true);
-pref("webgl.disable-fail-if-major-performance-caveat", true);
-pref("webgl.enable-debug-renderer-info", false);
-pref("webgl.min_capability_mode", true);
-// Ensure domain logging is disabled
-pref("loop.logDomains", false);
-// Spoof to dual-core cpu
-pref("dom.maxHardwareConcurrency", 2);
-// Disable offline cache
-pref("browser.cache.offline.enable", false);
-// Prevent tracking over multiple domains
-pref("privacy.firstparty.isolate", true);
-pref("network.proxy.no_proxies_on", "localhost, 127.0.0.1");
-// In relation to webrtc
-pref("media.peerconnection.turn.disable", true);
-pref("media.peerconnection.use_document_iceservers", false);
-pref("media.peerconnection.identity.timeout", 1);
-pref("media.peerconnection.ice.default_address_only", true);
-// Disable url prefetch
-pref("browser.urlbar.speculativeConnect.enabled", false);
-// Set platform, user-agent and locale to same values as Tor Browser 7.0.10
-pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0");
-pref("general.useragent.locale", "en-US");
-pref("general.platform.override", "Win32");
+# Mozilla User preferences
+
+/*
+ * Copyright (c) 2013-2017, The PurpleI2P Project
+ *
+ * This file is part of Purple i2pd project and licensed under BSD3
+ *
+ * See full license text in LICENSE file at top of project tree
+ */
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the browser is running,
+ * the changes will be overwritten when the browser exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
+ */
+
+pref("app.update.auto", false);
+pref("app.update.channel", "no");
+pref("app.update.enabled", false);
+pref("app.update.interval", 0);
+pref("app.update.service.enabled", false);
+pref("app.update.staging.enabled", false);
+pref("app.update.timer", 0);
+pref("beacon.enabled", false);
+pref("breakpad.reportURL", "");
+pref("browser.aboutHomeSnippets.updateUrl", "");
+pref("browser.cache.disk.capacity", 131072);
+pref("browser.casting.enabled", false);
+pref("browser.crashReports.unsubmittedCheck.enabled", false);
+// pref("browser.display.use_document_fonts", 0);
+pref("browser.download.manager.retention", 0);
+pref("browser.download.useDownloadDir", false);
+pref("browser.feeds.showFirstRunUI", false);
+pref("browser.fixup.alternate.enabled", false);
+pref("browser.fixup.hide_user_pass", true);
+pref("browser.formfill.enable", false);
+// PREF: Delete Search and Form History
+pref("browser.formfill.expire_days", 0);
+// PREF: Delete temporary files on exit
+pref("browser.helperApps.deleteTempFileOnExit", true);
+pref("browser.newtabpage.enhanced", false);
+pref("browser.newtabpage.introShown", true);
+// PREF: Do not create screenshots of visited pages
+pref("browser.pagethumbnails.capturing_disabled", true);
+pref("browser.places.smartBookmarksVersion", -1);
+pref("browser.pocket.enabled", false);
+pref("browser.pocket.useLocaleList", false);
+pref("browser.reader.detectedFirstArticle", false);
+pref("browser.rights.3.shown", true);
+pref("browser.safebrowsing.appRepURL", "");
+pref("browser.safebrowsing.blockedURIs.enabled", false);
+pref("browser.safebrowsing.downloads.enabled", false);
+pref("browser.safebrowsing.downloads.remote.enabled", false);
+pref("browser.safebrowsing.gethashURL", "");
+pref("browser.safebrowsing.keyURL", "localhost");
+pref("browser.safebrowsing.malware.enabled", false);
+pref("browser.safebrowsing.malware.reportURL", "");
+pref("browser.safebrowsing.phishing.enabled", false);
+pref("browser.safebrowsing.provider.google.appRepURL", "");
+pref("browser.safebrowsing.provider.google.gethashURL", "");
+pref("browser.safebrowsing.provider.google.lists", "");
+pref("browser.safebrowsing.provider.google.reportURL", "");
+pref("browser.safebrowsing.provider.google.updateURL", "");
+pref("browser.safebrowsing.provider.mozilla.gethashURL", "");
+pref("browser.safebrowsing.provider.mozilla.lists", "");
+pref("browser.safebrowsing.provider.mozilla.updateURL", "");
+pref("browser.safebrowsing.reportErrorURL", "");
+pref("browser.safebrowsing.reportGenericURL", "");
+pref("browser.safebrowsing.reportMalwareErrorURL", "");
+pref("browser.safebrowsing.reportMalwareURL", "");
+pref("browser.safebrowsing.reportPhishURL", "");
+pref("browser.safebrowsing.reportURL", "");
+pref("browser.safebrowsing.updateURL", "");
+pref("browser.safebrowsing.warning.infoURL", "");
+pref("browser.search.countryCode", "US");
+pref("browser.search.defaultenginename", "DuckDuckGo");
+pref("browser.search.geoSpecificDefaults", false);
+pref("browser.search.geoSpecificDefaults.url", "");
+pref("browser.search.geoip.url", "");
+pref("browser.search.order.1", "DuckDuckGo");
+pref("browser.search.redirectWindowsSearch", false);
+pref("browser.search.region", "US");
+pref("browser.search.searchEnginesURL", "");
+pref("browser.search.suggest.enabled", false);
+pref("browser.search.update", false);
+pref("browser.send_pings", false);
+pref("browser.send_pings.require_same_host", true);
+pref("browser.selfsupport.url", "");
+pref("browser.shell.checkDefaultBrowser", false);
+user_pref("browser.startup.homepage", "http://i2pd.i2p/");
+pref("browser.tabs.closeWindowWithLastTab", false);
+pref("browser.tabs.crashReporting.sendReport", false);
+pref("browser.tabs.loadInBackground", true);
+pref("browser.uitour.enabled", false);
+pref("browser.urlbar.filter.javascript", true);
+pref("browser.urlbar.formatting.enabled", false);
+pref("browser.urlbar.maxRichResults", 12);
+// pref("browser.urlbar.suggest.history", false);
+pref("browser.urlbar.suggest.searches", false);
+pref("browser.urlbar.trimURLs", false);
+pref("browser.usedOnWindows10", false);
+pref("browser.usedOnWindows10.introURL", "");
+pref("camera.control.face_detection.enabled", false);
+pref("canvas.capturestream.enabled", false);
+pref("clipboard.autocopy", false);
+pref("datareporting.healthreport.about.reportUrl", "");
+pref("datareporting.healthreport.about.reportUrlUnified", "");
+pref("datareporting.healthreport.documentServerURI", "");
+pref("datareporting.healthreport.pendingDeleteRemoteData", true);
+pref("datareporting.healthreport.service.enabled", false);
+pref("datareporting.healthreport.service.firstRun", false);
+pref("datareporting.healthreport.uploadEnabled", false);
+pref("datareporting.policy.dataSubmissionEnabled", false);
+pref("datareporting.policy.dataSubmissionEnabled.v2", false);
+pref("datareporting.policy.dataSubmissionPolicyAccepted", false);
+pref("datareporting.policy.dataSubmissionPolicyBypassAcceptance", false);
+pref("datareporting.policy.dataSubmissionPolicyNotifiedTime", "0");
+pref("datareporting.policy.dataSubmissionPolicyResponseType", "accepted-info-bar-dismissed");
+pref("datareporting.policy.dataSubmissionPolicyResponseTime", "0");
+pref("datareporting.policy.firstRunTime", "0");
+pref("datareporting.sessions.current.clean", true);
+pref("device.sensors.enabled", false);
+pref("devtools.chrome.enabled", false);
+pref("devtools.debugger.remote-enabled", false);
+pref("devtools.debugger.force-local", true);
+pref("devtools.webide.enabled", false);
+pref("devtools.webide.autoinstallADBHelper", false);
+pref("devtools.webide.autoinstallFxdtAdapters", false);
+pref("dom.allow_cut_copy", false);
+pref("dom.archivereader.enabled", false);
+pref("dom.battery.enabled", false);
+pref("dom.disable_open_during_load", true);
+pref("dom.enable_performance", false);
+pref("dom.enable_user_timing", false);
+pref("dom.event.clipboardevents.enabled", false);
+pref("dom.flyweb.enabled", false);
+pref("dom.gamepad.enabled", false);
+pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false);
+pref("dom.ipc.plugins.reportCrashURL", false);
+//pref("dom.indexedDB.enabled", false);
+pref("dom.mozTCPSocket.enabled", false);
+pref("dom.netinfo.enabled", false);
+pref("dom.network.enabled", false);
+pref("dom.serviceWorkers.enabled", false);
+pref("dom.telephony.enabled", false);
+pref("dom.vibrator.enabled", false);
+pref("dom.vr.enabled", false);
+pref("dom.webaudio.enabled", false);
+pref("dom.webnotifications.enabled", false);
+pref("dom.workers.enabled", false);
+pref("experiments.supported", false);
+pref("experiments.enabled", false);
+pref("experiments.manifest.uri", "");
+pref("extensions.autoDisableScopes", 0);
+pref("extensions.blocklist.enabled", false);
+pref("extensions.blocklist.url", "");
+pref("extensions.getAddons.cache.enabled", false);
+pref("extensions.getAddons.showPane", false);
+pref("extensions.lazarus.showDonateNotification", false);
+pref("extensions.pocket.enabled", false);
+pref("extensions.shownSelectionUI", true);
+pref("extensions.ui.lastCategory", "addons://list/extension");
+pref("extensions.update.autoUpdateDefault", false);
+pref("extensions.update.enabled", false);
+pref("full-screen-api.approval-required", false);
+pref("full-screen-api.warning.timeout", 0);
+pref("general.buildID.override", "19700101");
+pref("general.warnOnAboutConfig", false);
+pref("geo.enabled", false);
+pref("geo.wifi.uri", "");
+pref("geo.wifi.logging.enabled", false);
+// pref("gfx.font_rendering.opentype_svg.enabled", false);
+pref("intl.locale.matchOS", true);
+// pref("javascript.options.asmjs", false);
+pref("javascript.use_us_english_locale", true);
+pref("keyword.enabled", false);
+pref("lightweightThemes.update.enabled", false);
+pref("media.eme.enabled", false);
+pref("media.getusermedia.screensharing.enabled", false);
+pref("media.getusermedia.audiocapture.enabled", false);
+pref("media.gmp-eme-adobe.enabled", false);
+pref("media.gmp-gmpopenh264.enabled", false);
+pref("media.gmp-gmpopenh264.provider.enabled", false);
+pref("media.gmp-manager.url", "");
+// pref("media.gmp-provider.enabled", false);
+pref("media.navigator.enabled", false);
+pref("media.navigator.video.enabled", false);
+pref("media.peerconnection.enabled", false);
+pref("media.peerconnection.ice.no_host", true);
+pref("media.video_stats.enabled", false);
+pref("media.webspeech.recognition.enable", false);
+pref("media.webspeech.synth.enabled", false);
+pref("network.allow-experiments", false);
+// pref("network.cookie.cookieBehavior", 1);
+// PREF: Cookies expires at the end of the session (when the browser closes)
+// pref("network.cookie.lifetimePolicy", 2);
+pref("network.cookie.prefsMigrated", true);
+// pref("network.cookie.thirdparty.sessionOnly", true);
+// pref("network.dns.blockDotOnion", true);
+pref("network.dns.disableIPv6", true);
+pref("network.dns.disableprefetch", true);
+pref("network.dns.disableprefetchFromHTTPS", true);
+pref("network.dns.disablePrefetch", true);
+pref("network.dns.disablePrefetchFromHTTPS", true);
+// pref("network.http.referer.spoofSource", true);
+// pref("network.http.referer.XOriginPolicy", 2);
+pref("network.http.speculative-parallel-limit", 0);
+pref("network.IDN_show_punycode", true);
+pref("network.jar.open-unsafe-types", false);
+pref("network.manage-offline-status", false);
+pref("network.negotiate-auth.allow-insecure-ntlm-v1", false);
+pref("network.predictor.enabled", false);
+pref("network.prefetch-next", false);
+pref("network.protocol-handler.warn-external-default", true);
+pref("network.protocol-handler.external.http", false);
+pref("network.protocol-handler.external.https", false);
+pref("network.protocol-handler.external.javascript", false);
+pref("network.protocol-handler.external.moz-extension", false);
+pref("network.protocol-handler.external.ftp", false);
+pref("network.protocol-handler.external.file", false);
+pref("network.protocol-handler.external.about", false);
+pref("network.protocol-handler.expose-all", false);
+pref("network.protocol-handler.expose.http", true);
+pref("network.protocol-handler.expose.https", true);
+pref("network.protocol-handler.expose.javascript", true);
+pref("network.protocol-handler.expose.moz-extension", true);
+pref("network.protocol-handler.expose.ftp", true);
+pref("network.protocol-handler.expose.file", true);
+pref("network.protocol-handler.expose.about", true);
+pref("network.proxy.backup.ftp", "127.0.0.1");
+pref("network.proxy.backup.ftp_port", 4444);
+pref("network.proxy.backup.socks", "127.0.0.1");
+pref("network.proxy.backup.socks_port", 4444);
+pref("network.proxy.backup.ssl", "127.0.0.1");
+pref("network.proxy.backup.ssl_port", 4444);
+pref("network.proxy.ftp", "127.0.0.1");
+pref("network.proxy.ftp_port", 4444);
+pref("network.proxy.http", "127.0.0.1");
+pref("network.proxy.http_port", 4444);
+pref("network.proxy.share_proxy_settings", true);
+pref("network.proxy.socks", "127.0.0.1");
+pref("network.proxy.socks_port", 4444);
+pref("network.proxy.socks_remote_dns", true);
+pref("network.proxy.ssl", "127.0.0.1");
+pref("network.proxy.ssl_port", 4444);
+pref("network.proxy.type", 1);
+pref("network.cookie.prefsMigrated", true);
+pref("noscript.ABE.enabled", false);
+pref("noscript.ABE.wanIpAsLocal", false);
+pref("pdfjs.disabled", true);
+pref("pdfjs.enableWebGL", false);
+pref("plugin.default_plugin_disabled", true);
+// pref("plugin.state.flash", 0);
+pref("plugin.state.java", 0);
+pref("plugin.state.libgnome-shell-browser-plugin", 0);
+pref("plugins.click_to_play", true);
+pref("plugins.load_appdir_plugins", false);
+pref("plugins.update.notifyUser", false);
+pref("plugins.update.url", "");
+// PREF: Clear history when Firefox closes
+// pref("privacy.sanitize.sanitizeOnShutdown", true);
+// pref("privacy.clearOnShutdown.cache", true);
+// pref("privacy.clearOnShutdown.cookies", true);
+// pref("privacy.clearOnShutdown.downloads", true);
+// pref("privacy.clearOnShutdown.formdata", true);
+// pref("privacy.clearOnShutdown.history", true);
+// pref("privacy.clearOnShutdown.offlineApps", true);
+// pref("privacy.clearOnShutdown.sessions", true);
+// pref("privacy.clearOnShutdown.openWindows", true);
+pref("privacy.cpd.offlineApps", true);
+pref("privacy.cpd.cache", true);
+pref("privacy.cpd.cookies", true);
+pref("privacy.cpd.downloads", true);
+pref("privacy.cpd.formdata", true);
+pref("privacy.cpd.history", true);
+pref("privacy.cpd.sessions", true);
+pref("privacy.donottrackheader.enabled", true);
+pref("privacy.resistFingerprinting", true);
+pref("privacy.sanitize.timeSpan", 0);
+pref("privacy.trackingprotection.enabled", true);
+pref("privacy.trackingprotection.pbmode.enabled", true);
+pref("privacy.userContext.enabled", true);
+pref("reader.parse-on-load.enabled", false);
+pref("reader.parse-on-load.force-enabled", false);
+pref("security.csp.enable", true);
+pref("security.csp.experimentalEnabled", true);
+pref("security.dialog_enable_delay", 1000);
+pref("security.fileuri.strict_origin_policy", true);
+pref("security.insecure_field_warning.contextual.enabled", false);
+// PREF: Enable insecure password warnings (login forms in non-HTTPS pages)
+pref("security.insecure_password.ui.enabled", false);
+pref("security.mixed_content.block_active_content", true);
+pref("security.mixed_content.block_display_content", true);
+pref("services.blocklist.update_enabled", false);
+pref("security.sri.enable", true);
+pref("security.ssl.errorReporting.automatic", false);
+pref("security.ssl.errorReporting.enabled", false);
+pref("services.sync.enabled", false);
+pref("services.sync.prefs.sync.browser.download.manager.scanWhenDone", false);
+pref("services.sync.prefs.sync.browser.safebrowsing.enabled", false);
+pref("services.sync.prefs.sync.browser.search.update", false);
+pref("services.sync.prefs.sync.extensions.update.enabled", false);
+// pref("shumway.disabled", true);
+pref("signon.autofillForms", false);
+// PREF: Disable password manager
+pref("signon.rememberSignons", false);
+pref("startup.homepage_welcome_url", "about:blank");
+pref("startup.homepage_welcome_url.additional", "about:blank");
+pref("toolkit.telemetry.archive.enabled", false);
+pref("toolkit.telemetry.enabled", false);
+pref("toolkit.telemetry.optoutSample", false);
+pref("toolkit.telemetry.reportingpolicy.firstRun", false);
+pref("toolkit.telemetry.server", "");
+pref("toolkit.telemetry.unified", false);
+pref("toolkit.telemetry.unifiedIsOptIn", true);
+pref("webgl.disabled", true);
+pref("webgl.disable-extensions", true);
+pref("webgl.disable-fail-if-major-performance-caveat", true);
+pref("webgl.enable-debug-renderer-info", false);
+pref("webgl.min_capability_mode", true);
+// Ensure domain logging is disabled
+pref("loop.logDomains", false);
+// Spoof to dual-core cpu
+pref("dom.maxHardwareConcurrency", 2);
+// Disable offline cache
+pref("browser.cache.offline.enable", false);
+// Prevent tracking over multiple domains
+pref("privacy.firstparty.isolate", true);
+pref("network.proxy.no_proxies_on", "localhost, 127.0.0.1");
+// In relation to webrtc
+pref("media.peerconnection.turn.disable", true);
+pref("media.peerconnection.use_document_iceservers", false);
+pref("media.peerconnection.identity.timeout", 1);
+pref("media.peerconnection.ice.default_address_only", true);
+// Disable url prefetch
+pref("browser.urlbar.speculativeConnect.enabled", false);
+// Set platform, user-agent and locale to same values as Tor Browser 7.0.10
+pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0");
+pref("general.useragent.locale", "en-US");
+pref("general.platform.override", "Win32");
diff --git a/osx/build/profile/bookmarks.html b/osx/build/profile/bookmarks.html
new file mode 100644
index 0000000..1a3ad7f
--- /dev/null
+++ b/osx/build/profile/bookmarks.html
@@ -0,0 +1,38 @@
+
+
+
+
Bookmarks
+Bookmarks
+
+
+
Bookmarks Toolbar
+ - Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
+
+
- Purple I2P Webconsole
+
- Веб-панель управления миром
+
- 333.i2p: Форум, посвященный разработке и поддержке i2pd
+
- 333.i2p: Форум, посвященный разработке и поддержке i2pd
+
- 102chan
+
- ИИ, живущий в даркнете, с кодовым названием "Тлено-тян"
+
- Dead End
+
- Dead End - News
+
- Флибуста
+
- Флибуста - независимый библиотечный ресурс. Как и в любой библиотеке, просьба соблюдать чистоту, порядок и спокойствие. Здесь читают и работают хорошие люди.
+
- I2P Name Registry
+
- Поиск и регистрация в i2p зоне
+
- LifeBOX
+
- Самая шикарная социальная сеть в сети i2p. Общение с друзьями. Игры. Прикольные картинки без СМС!
+
- IdentyGuy
+
- eepsites
+
- #onelon
+
- onelon - анонимные блоги без цензуры
+
- Профессиональный Эксперт
+
- ARMADA Первый в мире Глобальный Хуяк сервис 24/7
+
- Public Torrent - server of information exchange
+
- Публичный торрент трекер
+
- Сервисы, работающие на I2Pd
+
- Сервисы, работающие на I2Pd
+
+
diff --git a/osx/build/profile/prefs.js b/osx/build/profile/prefs.js
new file mode 100644
index 0000000..af938e0
--- /dev/null
+++ b/osx/build/profile/prefs.js
@@ -0,0 +1,12 @@
+# Mozilla User Preferences
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the browser is running,
+ * the changes will be overwritten when the browser exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
+ */
+
+user_pref("browser.startup.homepage", "http://i2pd.i2p/");
\ No newline at end of file
diff --git a/osx/build/profile/xulstore.json b/osx/build/profile/xulstore.json
new file mode 100644
index 0000000..9a47c1a
--- /dev/null
+++ b/osx/build/profile/xulstore.json
@@ -0,0 +1 @@
+{"chrome://browser/content/browser.xul":{"navigator-toolbox":{"iconsize":"small"},"titlebar-placeholder-on-menubar-for-caption-buttons":{"width":"96"},"titlebar-placeholder-on-TabsToolbar-for-captions-buttons":{"width":"96"},"main-window":{"screenX":"0","screenY":"0","width":"1280","height":"720","sizemode":"normal"},"PersonalToolbar":{"collapsed":"false","currentset":"personal-bookmarks"},"toolbar-menubar":{"currentset":"menubar-items"},"TabsToolbar":{"currentset":"tabbrowser-tabs,new-tab-button,alltabs-button"},"addon-bar":{"currentset":"addonbar-closebutton,status-bar"},"sidebar-title":{"value":""}}}
\ No newline at end of file
diff --git a/osx/i2pd_2.16.0_osx/addressbook/addresses.csv b/osx/i2pd/addressbook/addresses.csv
similarity index 100%
rename from osx/i2pd_2.16.0_osx/addressbook/addresses.csv
rename to osx/i2pd/addressbook/addresses.csv
diff --git a/osx/i2pd/certificates/family/gostcoin.crt b/osx/i2pd/certificates/family/gostcoin.crt
new file mode 100644
index 0000000..5fa531e
--- /dev/null
+++ b/osx/i2pd/certificates/family/gostcoin.crt
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6jCCAY+gAwIBAgIJAPeWi4iUKLBJMAoGCCqGSM49BAMCMHoxCzAJBgNVBAYT
+AlhYMQswCQYDVQQIDAJYWDELMAkGA1UEBwwCWFgxHjAcBgNVBAoMFUkyUCBBbm9u
+eW1vdXMgTmV0d29yazEPMA0GA1UECwwGZmFtaWx5MSAwHgYDVQQDDBdnb3N0Y29p
+bi5mYW1pbHkuaTJwLm5ldDAeFw0xNzA4MDExMzQ4MzdaFw0yNzA3MzAxMzQ4Mzda
+MHoxCzAJBgNVBAYTAlhYMQswCQYDVQQIDAJYWDELMAkGA1UEBwwCWFgxHjAcBgNV
+BAoMFUkyUCBBbm9ueW1vdXMgTmV0d29yazEPMA0GA1UECwwGZmFtaWx5MSAwHgYD
+VQQDDBdnb3N0Y29pbi5mYW1pbHkuaTJwLm5ldDBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABC+9iIYumUNnsqKbnTluHimV8OdGvo7yeGxuqhfNNB2b3jvbFJ81scgH
+dsZtMQmUxgKM5nH+NQJMoCxHhSlRy2QwCgYIKoZIzj0EAwIDSQAwRgIhANNh7mOp
+nBBPRh2a/ipG1VYS0d+mNjSrpz8xWcG3CXPLAiEAjM5MTfv9sOJ74PeZVhFZ02w4
+vhgyZCeLJ57f123Lm1A=
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/family/i2p-dev.crt b/osx/i2pd/certificates/family/i2p-dev.crt
new file mode 100644
index 0000000..a579651
--- /dev/null
+++ b/osx/i2pd/certificates/family/i2p-dev.crt
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIICCjCCAa2gAwIBAgIEfT9YJTAMBggqhkjOPQQDAgUAMHkxCzAJBgNVBAYTAlhY
+MQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBBbm9ueW1v
+dXMgTmV0d29yazEPMA0GA1UECxMGZmFtaWx5MR8wHQYDVQQDExZpMnAtZGV2LmZh
+bWlseS5pMnAubmV0MB4XDTE1MTIwOTIxNDIzM1oXDTI1MTIwODIxNDIzM1oweTEL
+MAkGA1UEBhMCWFgxCzAJBgNVBAgTAlhYMQswCQYDVQQHEwJYWDEeMBwGA1UEChMV
+STJQIEFub255bW91cyBOZXR3b3JrMQ8wDQYDVQQLEwZmYW1pbHkxHzAdBgNVBAMT
+FmkycC1kZXYuZmFtaWx5LmkycC5uZXQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
+AAR7FPSglYrxeSPzv74A1fTwjajZWV0TljqEMBS/56juZQB/7xOwrsHFHA0eEEF9
+dTH64wx3lhV/9sh/stwPU2MToyEwHzAdBgNVHQ4EFgQUQh4uRP1aaX8TJX5dljrS
+CeFNjcAwDAYIKoZIzj0EAwIFAANJADBGAiEAhXlEKGCjJ4urpi2db3OIMl9pB+9t
+M+oVtAqBamWvVBICIQDBaIqfwLzFameO5ULgGRMysKQkL0O5mH6xo910YQV8jQ==
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/family/i2pd-dev.crt b/osx/i2pd/certificates/family/i2pd-dev.crt
new file mode 100644
index 0000000..3bb6f42
--- /dev/null
+++ b/osx/i2pd/certificates/family/i2pd-dev.crt
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY+gAwIBAgIJAI7G9MXxh7OjMAoGCCqGSM49BAMCMHoxCzAJBgNVBAYT
+AlhYMQswCQYDVQQIDAJYWDELMAkGA1UEBwwCWFgxHjAcBgNVBAoMFUkyUCBBbm9u
+eW1vdXMgTmV0d29yazEPMA0GA1UECwwGZmFtaWx5MSAwHgYDVQQDDBdpMnBkLWRl
+di5mYW1pbHkuaTJwLm5ldDAeFw0xNjAyMjAxNDE2MzhaFw0yNjAyMTcxNDE2Mzha
+MHoxCzAJBgNVBAYTAlhYMQswCQYDVQQIDAJYWDELMAkGA1UEBwwCWFgxHjAcBgNV
+BAoMFUkyUCBBbm9ueW1vdXMgTmV0d29yazEPMA0GA1UECwwGZmFtaWx5MSAwHgYD
+VQQDDBdpMnBkLWRldi5mYW1pbHkuaTJwLm5ldDBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABMlWL3loKVOfsA8Rm91QR53Il69mQiaB7n3rUhfPkJb9MYc1S4198azE
+iSnNZSXicKDPIifaCgvONmbACzElHc8wCgYIKoZIzj0EAwIDSAAwRQIgYWmSFuai
+TJvVrlB5RlbiiNFCEootjWP8BFM3t/yFeaQCIQDkg4xcQIRGTHhjrCsxmlz9KcRF
+G+eIF+ATfI93nPseLw==
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/family/mca2-i2p.crt b/osx/i2pd/certificates/family/mca2-i2p.crt
new file mode 100644
index 0000000..f5b5730
--- /dev/null
+++ b/osx/i2pd/certificates/family/mca2-i2p.crt
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBwTCCAWigAwIBAgIJAOZBC10+/38EMAkGByqGSM49BAEwZzELMAkGA1UEBhMC
+QVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdp
+dHMgUHR5IEx0ZDEgMB4GA1UEAwwXbWNhMi1pMnAuZmFtaWx5LmkycC5uZXQwHhcN
+MTYwMzI4MjIwMjMxWhcNMjYwMzI2MjIwMjMxWjBnMQswCQYDVQQGEwJBVTETMBEG
+A1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkg
+THRkMSAwHgYDVQQDDBdtY2EyLWkycC5mYW1pbHkuaTJwLm5ldDBZMBMGByqGSM49
+AgEGCCqGSM49AwEHA0IABNNyfzJr/rMSUeWliVBbJHRF2+qMypOlHEZ9m1nNATVX
+64OhuyuVCmbF9R3oDkcZZJQQK1ovXd/EsbAIWDI8K/gwCQYHKoZIzj0EAQNIADBF
+AiEApmv2tvMwzlvPjHJG1/5aXOSjYWw2s4ETeGt4abWPQkACIBbF3RuCHuzg+KN8
+N0n9hAJztAqhRCdG3hilxF4fbVLp
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/family/volatile.crt b/osx/i2pd/certificates/family/volatile.crt
new file mode 100644
index 0000000..928c7f3
--- /dev/null
+++ b/osx/i2pd/certificates/family/volatile.crt
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBxDCCAWmgAwIBAgIJAJnJIdKHYwWcMAoGCCqGSM49BAMCMGcxCzAJBgNVBAYT
+AkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRn
+aXRzIFB0eSBMdGQxIDAeBgNVBAMMF3ZvbGF0aWxlLmZhbWlseS5pMnAubmV0MB4X
+DTE2MDQyNjE1MjAyNloXDTI2MDQyNDE1MjAyNlowZzELMAkGA1UEBhMCQVUxEzAR
+BgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5
+IEx0ZDEgMB4GA1UEAwwXdm9sYXRpbGUuZmFtaWx5LmkycC5uZXQwWTATBgcqhkjO
+PQIBBggqhkjOPQMBBwNCAARf6LBfbbfL6HInvC/4wAGaN3rj0eeLE/OdBpA93R3L
+s8EUp0YTEJHWPo9APiKMmAwQSsMJfjhNrbp+UWEnnx2LMAoGCCqGSM49BAMCA0kA
+MEYCIQDpQu2KPV5G1JOFLoZvdj+rcvEnjxM/FxkaqikwkVx8FAIhANP7DkUal+GT
+SuiCtcqM4QyIBsfsCJBWEMzovft164Bo
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/atomike_at_mail.i2p.crt b/osx/i2pd/certificates/reseed/atomike_at_mail.i2p.crt
new file mode 100644
index 0000000..1e724f0
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/atomike_at_mail.i2p.crt
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+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
+cGpnw4a2u9sHZIUNHzoGq32+7UWXsBI5Ow==
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/backup_at_mail.i2p.crt b/osx/i2pd/certificates/reseed/backup_at_mail.i2p.crt
new file mode 100644
index 0000000..73b08ea
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/backup_at_mail.i2p.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFfTCCA2WgAwIBAgIEOprmhjANBgkqhkiG9w0BAQ0FADBvMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEYMBYGA1UEAwwPYmFja3VwQG1haWwu
+aTJwMB4XDTEzMTAxMzEzNDQ1NVoXDTIzMTAxMzEzNDQ1NVowbzELMAkGA1UEBhMC
+WFgxCzAJBgNVBAgTAlhYMQswCQYDVQQHEwJYWDEeMBwGA1UEChMVSTJQIEFub255
+bW91cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAxGDAWBgNVBAMMD2JhY2t1cEBtYWls
+LmkycDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIoAkobXwk/Enf1d
+roHyqCyvcJfZJVTwb/LgYWAvCBMCr+RGqlSgtk3g69Y3I0xU08fD2kGt3r5Pwsbr
+omXIbJAcccyLqmQ5QX6QgL+X9VpMDp9C4h2RogCrqLBAWw4cuZ4RS9VCpP1Yis7H
+uejYqENP86p7BsRnuW/4cYnfunAdMpss4LpRGQXt1nTX+kfgCYgnKFbFqwAHt7yV
+Ds+Pe6FuBHPlp+sc1amKRcUnSvhXLsv43VicnT7xYL/kUsN83wrtHA3B4aGDx3aA
+3/EzuRmIXQB0BlTZILMEyYwG/nc4OsW82QYrvEZ9BIg9A4lF/wS/KZCICPxLF2zo
+dGjnmlgkiA4s8eO+va/ElHyELjckVXqmG1eXHhSkEsDvOQJy01IUuwLinvq7cUbJ
+HfJBZJllEg+sLDCv3FkEqN+XjBNFfQN4oNew4w6IPY6YH1INVB9LL0Cmdu4DudLv
+TY8OcI8eSfez3hmm+pYQ23PJRYYnvRDnRECyIWBegkckWRh8U/WvZUYUvETK6EDl
+/0KpTtfzX6MqHA5D6bTAB8Y3ijGMLrZ/B5vj5yCoZbLiGme9X2moR2k1LEhdhtzV
+exsqezCpg6dn48FTX7mHjvR5/r4kz2jqBGmdPUWIIxnjFUzDUK3llVQiHihleHpe
+jL4LqnhBGKWFRTaVwaIkBG4zAfIzAgMBAAGjITAfMB0GA1UdDgQWBBQNkfW7bSMl
+1/4KDbgwrkf9x1Zu/TANBgkqhkiG9w0BAQ0FAAOCAgEAGg3a3rTf0EznQocmio0T
+5gCoL0n8h6yKW/PyPAIELrd9wiYjhJFcWvMTcJJJnVqmAL5vpvhaAFVtAfx70MGa
+0DZ7FvytK5hEfF4IqOFDyEEVGJR5rIpVK4MeI1nmwEsxdbW+FhODjtRzgYO8XBME
+Xj4aY1FWg9vxc3reUj6PSFsZtsB0aLiRgL9JDovJIiRw0Uqr1v2wXBte5yVCxDge
+vTREZtpK4cKetoOa68pwSXI32JwKE18j6bfdKVBCcYQKlKP/3gHGduaDrQv3w32S
+DRym5s6MREeTUOtAw4wq46KpdOX8yyAqJPrCfMwS6ORd3t+egqOw0PUnsqb97w4O
+lUtrRYvb2cOj60SmRx4vJvItyuHbKqIK7o2e1RcUZPXYoAVx2ww4XB2Wk4D7LSAs
+cS7nLj8yAqzJ2qqtBzxu+zILJtkVa12dKF0xmS0BxBp4sCYiBtmAVE8AWQqEuSHA
+FrMWqoXcjcfdvvyX487FFWWUE7ZBIn0hee2sK9J9+SPtqczJaN7TF3K3nzo65WJG
+1epltmq2Ugjb67Gz7v4y7H23DJ/qhm8yLtCHTj69HTta5I08j6Kut924WLZaiMO/
+4YoEL5AE63X0sxYibKFQiq7FW5nUJA280GRlY3xSMFzlB2ggazrUV3YAWVDhfdnI
+flpzWXkFM2D36OUaubfe9YY=
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/bugme_at_mail.i2p.crt b/osx/i2pd/certificates/reseed/bugme_at_mail.i2p.crt
new file mode 100644
index 0000000..2b6acac
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/bugme_at_mail.i2p.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFezCCA2OgAwIBAgIEUQYyQjANBgkqhkiG9w0BAQ0FADBuMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOYnVnbWVAbWFpbC5p
+MnAwHhcNMTQxMTA2MDkxMTE0WhcNMjQxMTA1MDkxMTE0WjBuMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOYnVnbWVAbWFpbC5p
+MnAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCrThOH0eSDT0VnCSBC
+sqYmAydWH+O8eNttDXr2mSvZLhvAW+6/xHTkKhaWvkIvvS0Vh8hujMnD90Cgp4Fk
+TKCxMj9K527o5xIZwWW05OevbjlBwIpVLO1PjmsfsoD1nIX14eEzJSEoAulKsv7V
+jGUC/6hC11mmVvH9buQLSRv6sCjuAcMszmw3TAD+XYBIs+z57KuwYXtX3+OA543c
+l1/ZKLYkkwY8cwzZqWDVWqTKP5TfVae58t40HhJk3bOsr21FZsaOjlmao3GO+d/3
+exKuUGJRcolSqskL3sZ1ovFqko81obvvx0upI0YA0iMr/NRGl3VPuf/LJvRppYGc
+LsJHgy9TIgtHvaXRi5Nt4CbKl9sZh/7WkkTTI5YGvevu00btlabAN+DSAZZqdsB3
+wY8HhM1MHiA9SWsqwU65TwErcRrjNna2FiDHEu0xk5+/iAGl6CSKHZBmNcYKXSv8
+cwShB0jjmciK0a05nC638RPgj0fng7KRrSglyzfjXRrljmZ40LSBL/GGMZMWpOM7
+mEsBH5UZJ/2BEmjc9X9257zBdx8BK8y1TXpAligpNBsERcTw1WP1PJ35einZvlXW
+qI3GwMf0sl26sn+evcK0gDl27jVDZ45MtNQEq64M4NV3Tn9zq0eg/39YvjVeqrI5
+l7sxmYqYGR6BuSncwdc4x+t6swIDAQABoyEwHzAdBgNVHQ4EFgQU/REZ7NMbVZHr
+Xkao6Q8Ccqv2kAMwDQYJKoZIhvcNAQENBQADggIBACc2YjLVNbl1kJUdg2klCLJt
+5LjNTiIZa2Cha5GStlC/lyoRRge6+q/y9TN3tTptlzLPS9pI9EE1GfIQaE+HAk+e
+/bC3KUOAHgVuETvsNAbfpaVsPCdWpFuXmp/4b9iDN7qZy4afTKUPA/Ir/cLfNp14
+JULfP4z2yFOsCQZ5viNFAs1u99FrwobV2LBzUSIJQewsksuOwj96zIyau0Y629oJ
+k+og88Tifd9EH3MVZNGhdpojQDDdwHQSITnCDgfRP5yER1WIA4jg6l+mM90QkvLY
+5NjWTna5kJ3X6UizvgCk365yzT2sbN3R9UGXfCJa9GBcnnviJtJF3+/gC0abwY2f
+NtVYp32Xky45NY/NdRhDg0bjHP3psxmX+Sc0M9NuQcDQ+fUR+CzM0IGeiszkzXOs
+RG+bOou2cZ81G4oxWdAALHIRrn7VvLGlkFMxiIZyhYcTGQZzsTPT6n18dY99+DAV
+yQWZfIRdm8DOnt0G+cwfeohc/9ZwDmj4jJAAi0aeTXdY6NEGIVydk6MAycEhg2Hx
+9EV96kRwZNIW0AGY8CozECFL3Eyo2ClQVV4Q35SsBibsitDjM03usc2DJ/qjynXA
+C8HoOSWgbddiBvqZueqK8GdhykOy3J3ysr+MNN/lbG48LqkQr1OWxev9rGGQ6RJT
+wpBgPyAFAwouPy1whmnx
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt b/osx/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt
new file mode 100644
index 0000000..07fe75a
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+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
+Hz8KWVkHZg==
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/echelon_at_mail.i2p.crt b/osx/i2pd/certificates/reseed/echelon_at_mail.i2p.crt
new file mode 100644
index 0000000..ad10e3a
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/echelon_at_mail.i2p.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFfzCCA2egAwIBAgIESg3kkzANBgkqhkiG9w0BAQ0FADBwMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEZMBcGA1UEAwwQZWNoZWxvbkBtYWls
+LmkycDAeFw0xNDA3MzExNjQ3MDJaFw0yNDA3MzAxNjQ3MDJaMHAxCzAJBgNVBAYT
+AlhYMQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBBbm9u
+eW1vdXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRkwFwYDVQQDDBBlY2hlbG9uQG1h
+aWwuaTJwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmcEgLwwhzLNe
+XLOMSrhwB8hWpOhfjo4s6S/wjBtjjUc8nI3D0hSn3HY26p0rvcvNEWexPUpPULmC
+exGkU463nu7PiFONiORI1eJAiUFHibRiaA7Wboyo38pO73KirwjG07Y+Ua0jp+HS
++4FQ/I/9H/bPplReTOU/6hmRbgQ69U8nE68HzZHQxP68yVJ2rPHSXMPhF4R1h0G1
+1mCAT+TgTsnwHNGF77XHJnY4/M4e2cgycEZjZow36C3t2mNDVkMgF19QQeb9WmLR
+zREn3nq9BJqHpUkn9yWw0kKXTZSds+7UxESfzf3BzK0+hky2fh5H+qbYAo2lz4yj
+81MXTAu+4RRkg4DBLlF+2dkclhwQLxxzvkRC6tPkn5i33Yltg7EfzA9IoQ05potJ
+I+iOcF+aStfFgFj9u3B5UkcF4P0cH1QD3c6BK4hIezQYqRoPly1gHqg+XdwjG/dr
+4as7HA9FTz3p2E8nClpIC1x3hfgwAdfd29aeBxO1WW/z99iMF7TBAF+u5T86XEW1
+WpknqCbTli36yJ8a5fPWxZHrryBRJT5yLxejjFeadtutBSwljiVFq+Y38VqwFivq
+VLiBt7IxAsZ8iilgfnnnAvBH6chWfSKb4H7kB4TJvDiV96QmmvoEaWYNHZozMhyK
+tO3b5w+xqbJXyCLA3Q75jD0km76hjcECAwEAAaMhMB8wHQYDVR0OBBYEFAHQcAam
+QRS/EUhuCSr9pB4Ux0rYMA0GCSqGSIb3DQEBDQUAA4ICAQBq1+1QLmgLAjrTg3tb
+4XKgAVICQRoBDNUEobQg3pYeUX9eFNya2RxNljuvYpwT80ilGMPOXcjddmr5ngiK
+dbGRcuuJk9MPEHtPaPT3+JJlvKQ3B3g2wva2Wz2OAyLZUGQs389K4nTbwh4QF0n2
+aHFL8BHiD62hiKnCoNaW4ZovUNNvOxo9lMyAiaFU2gqQNcdad8hP9EAllbvbxDx9
+Tjww2UbwQUIHS9rna4Tlu+f0hDXTWIutc2A51W2fJCb7L3+lYO7Wv55ND/WtryLZ
+XpMp27+MpuEnN3kQmz/l9R0hIJsWc/x9GQkjm5wEaIZEyTtenqwRKGmVCtAj0Pgv
+jn1L3/lWmrNq+OZHb/QeyfKtA3nXfQKVmT98ewQiK/S5i1xIAXCJPytOD887b/o1
+cdurTmCiZMwgiQ+HLJqCg3MDa5mvKqRkRdZXfE6aQWEcSbpAhpV15R17q7L+Fg0W
+shLSNucxyGNU8PjiC/nOmqfqUiPiMltJjPmscxBLim8foyxjakC4+6N6m+Jzgznj
+PocBehFAfKYj66XEwzIBN7Z2uuXoYH9YptkocFjTzvchcryVulDWZ4FWxreUMhpM
+4oyjjhSB4tB9clXlwMqg577q3D6Ms0zLTqsztyPN3zr6jGev3jpVq7Q1GOlciHPv
+JNJOWTH/Vas1W6XlwGcOOAARTQ==
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt b/osx/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt
new file mode 100644
index 0000000..d0ff7c3
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/igor_at_novg.net.crt b/osx/i2pd/certificates/reseed/igor_at_novg.net.crt
new file mode 100644
index 0000000..12ce7a6
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/igor_at_novg.net.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/lazygravy_at_mail.i2p.crt b/osx/i2pd/certificates/reseed/lazygravy_at_mail.i2p.crt
new file mode 100644
index 0000000..1ff5346
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/lazygravy_at_mail.i2p.crt
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+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
++g==
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/meeh_at_mail.i2p.crt b/osx/i2pd/certificates/reseed/meeh_at_mail.i2p.crt
new file mode 100644
index 0000000..6014c96
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/meeh_at_mail.i2p.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFeTCCA2GgAwIBAgIEZZozujANBgkqhkiG9w0BAQ0FADBtMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEWMBQGA1UEAwwNbWVlaEBtYWlsLmky
+cDAeFw0xNDA2MjgyMjQ5MDlaFw0yNDA2MjcyMjQ5MDlaMG0xCzAJBgNVBAYTAlhY
+MQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBBbm9ueW1v
+dXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRYwFAYDVQQDDA1tZWVoQG1haWwuaTJw
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnVnmPE4uUvCky0yCnnVH
+cJEDqzwDPupx0zr0YDlhZk5VOPPecx5haayJ/V6nXPc1aVVWn+CHfedcF2aBgN4K
+5aBueS/l6l5WHcv02DofAqlTmyAws3oQeR1qoTuW24cKRtLR7h5bxv63f6bgp6e+
+RihFNez6UxErnRPuJOJEO2Im6EgVp6fz7tQ7R35zxAUeES2YILPySvzy2vYm/EEG
+jXX7Ap2A5svVo90xCMOeUZ/55vLsjyIshN+tV87U4xwvAkUmwsmWVHm3BQpHkI6z
+zMJie6epB8Bqm0GYm0EcElJH4OCxGTvDLoghpswbuUO7iy3JSfoL7ZCnoiQdK9K4
+yVVChj8lG+r7KaTowK96iZep+sZefjOt5VFGuW2Fi/WBv3ldiLlJAo/ZfrUM4+vG
+fyNBXbl6bX87uTCGOT1p3dazo+zJMsAZ+Y93DlM/mDEWFa1kKNrs74syzaWEqF4L
+KQE6VoYn80OOzafSigTVQgSwUtQtB0XGhMzJhyxU2XHWe1LFIy7Pta0B+lDiZj7c
+I8nXxYjsDfEu/Elj/Ra9N6bH0awmgB5JDa+Tbir+oEM5SyDfpSaCGuatdGxjweGI
+kVmFU0SqCZV/8TXbIu6MUVzTZMZVT94edifFSRad4fqw7eZbSXlPu++3d1/btn6h
+ibM04nkv0mm+FxCKB/wdAkECAwEAAaMhMB8wHQYDVR0OBBYEFO7jIkSRkoXyJcho
+9/Q0gDOINa5EMA0GCSqGSIb3DQEBDQUAA4ICAQBzfWO7+8HWOKLaYWToJ6XZbpNF
+3wXv1yC4W/HRR80m4JSsq9r0d7838Nvd7vLVP6MY6MaVb/JnV76FdQ5WQ6ticD0Y
+o3zmpqqbKVSspN0lrkig4surT88AjfVQz/vEIzKNQEbpzc3hC2LCiE2u+cK/ix4j
+b9RohnaPvwLnew5RNQRpcmk+XejaNITISr2yQIwXL7TEYy8HdGCfzFSSFhKe9vkb
+GsWS5ASrUzRoprswmlgRe8gEHI+d51Z7mWgna0/5mBz9bH/3QXtpxlLWm3bVV+kt
+pZjQDTHE0GqG2YsD1Gmp4LU/JFhCojMTtiPCXmr9KFtpiVlx06DuKm5PC8Ak+5w+
+m/DQYYfv9z+AA5Y430bjnzwg67bhqVyyek4wcDQinFswv3h4bIB7CJujDcEqXXza
+lhG1ufPPCUTMrVjh7AShohZraqlSlyQPY9vEppLwD4W1d+MqDHM7ljOH7gQYaUPi
+wE30AdXEOxLZcT3aRKxkKf2esNofSuUC/+NXQvPjpuI4UJKO3eegi+M9dbnKoNWs
+MPPLPpycecWPheFYM5K6Ao63cjlUY2wYwCfDTFgjA5q8i/Rp7i6Z6fLE3YWJ4VdR
+WOFB7hlluQ//jMW6M1qz6IYXmlUjcXl81VEvlOH/QBNrPvX3I3SYXYgVRnVGUudB
+o3eNsanvTU+TIFBh2Q==
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt b/osx/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt
new file mode 100644
index 0000000..850b1af
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFiTCCA3GgAwIBAgIEY2XeQjANBgkqhkiG9w0BAQ0FADB1MQswCQYDVQQGEwJY
+WDELMAkGA1UECAwCWFgxHjAcBgNVBAcMFUkyUCBBbm9ueW1vdXMgTmV0d29yazEL
+MAkGA1UECgwCWFgxDDAKBgNVBAsMA0kyUDEeMBwGA1UEAwwVcjRzYXMtcmVzZWVk
+QG1haWwuaTJwMB4XDTE3MDYyMjEwNTQ1NFoXDTI3MDYyMDEwNTQ1NFowdTELMAkG
+A1UEBhMCWFgxCzAJBgNVBAgMAlhYMR4wHAYDVQQHDBVJMlAgQW5vbnltb3VzIE5l
+dHdvcmsxCzAJBgNVBAoMAlhYMQwwCgYDVQQLDANJMlAxHjAcBgNVBAMMFXI0c2Fz
+LXJlc2VlZEBtYWlsLmkycDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+ANgsj5LhF4uGG4RDueShqYQZsG5Rz6XUAtK9sVGFdmdJTDZirUMZcCGCGZP/Harz
+QaZU9EYxOCztnpLCQksSCpdRsij56MURS0tW/1x7LHIDUOi911Of57jgIHH+3E5n
+6tuRxEk6J/9Ji3PI+89kl0sPKMVFMyKkINprVTA5zr/keyYEG0p6HSEYYiJkQH78
+8uoOCAmlk9mxkJFb+zviCk6jsYwdH+ofD6Lw5ueOlYUbeZ9Nd7jfSdf20XM7ofIw
+W2COtsbq3J7vNrQJMV7HkHxVx/7OqmjQF02OahZFZREVZqbHpL501iTn9Iqd5qKq
+IsxYjk7ZnP4UUCBk8NOU5TuWsy0qNw+TJDI9s55Fi4KPtXWf47HIl6CdpM5y/D5L
+eufCojSwPKlrD6x9gTyJdBggBZRIyplXdKffo/95hUhEkv86yfsVVR7Gu1uy0O8T
+Gtb8Da/oi5eEZBHWonLVicLPei5jeo+1gbR09PQ6s41uMZlOhMe4RSgiIQj/7UVo
+ffKdl1MPNKr1u2fgVj8kxqg8ZivWKQ2taEgimU2EkQcNcE96M9yQlNNpNvqSAQVk
+wYXlHt0AN6A1A8u1pItxaTwXnbmx+OBJZoKl4ZQeaC8wtKjTgAgVXp+g5iot2gir
+LjxCRx1WLG1c8vRg1W8CDZII8Swc8EWpMhI+0hPv7/4/AgMBAAGjITAfMB0GA1Ud
+DgQWBBTN5sKbrNzwE8sgMGDekfOPgX8/JDANBgkqhkiG9w0BAQ0FAAOCAgEAjLaB
+bHqvFTs0ikAtesk9r8+8XVIsP5FR57zZCek2vxkHcCQWw8Uqs3ndInRX4FirKSLT
+WRb4aSwFCkrmwueecTpXN/RBC+fZj+POCfdILEsA+FGreAM2q5ZXv/Q0jyIXOXEM
++KL0JZXnNS0/dqR3IYbC7f39CL6Sf40gRGTwTWWGg3KnynoS0v1zQcZLTMhHBD2X
+tgdIPbroq9t4gXa7Dhm0egYfQOI/7re2wiZT7UWVVwEpYqKf6JApFHa1nNOFMrLF
+45JHQIHArkoxpQdfSe9HBoyJiB5vz398rHZeqbJaF3PIg9rxWWY/NvvOVuIk8U5z
+0jExhg29a88B32U7ndvQJqIuGiQghzCiLxC/y1+wAdpeDSbD3OAOHqplvMj3BUn9
+yhDSLSjtfBJjnXKxtEcWLR0edHCGEk5mAcL7q1WNxDpxaICwGGpNZN53CtFx7amb
+egYil448DmiqoQTCTE9pBz8YjwiVfCYLYv17O0NJyYM9Efy/wL3rFlsPJniWHMuH
+imZybVU4ukjvfOZ+LY4COTwz6w4sfA7a+i+2mOynC7eKX8Yg6i1nXlcY1Z8ykNgi
+7B3kz1T/DV56CIm6QUWtepfuKTYq4C6QrBBIXLk1d5g95aWA21u1LRqNZ9GLH+eA
+gfvIm7v+cELj8a53EQY0LafzZqNC5kQAp916coU=
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/r4sas_at_mail.i2p.crt b/osx/i2pd/certificates/reseed/r4sas_at_mail.i2p.crt
new file mode 100644
index 0000000..b0c8d74
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/r4sas_at_mail.i2p.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFezCCA2OgAwIBAgIEb8xTzzANBgkqhkiG9w0BAQ0FADBuMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxHjAcBgNVBAcTFUkyUCBBbm9ueW1vdXMgTmV0d29yazEL
+MAkGA1UEChMCWFgxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOcjRzYXNAbWFpbC5p
+MnAwHhcNMTYwODExMjIyNDM2WhcNMjYwODExMjIyNDM2WjBuMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxHjAcBgNVBAcTFUkyUCBBbm9ueW1vdXMgTmV0d29yazEL
+MAkGA1UEChMCWFgxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOcjRzYXNAbWFpbC5p
+MnAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDjUMy/aYd0i6Oc3rdc
+24V/fM2vhviH+cNhAOXsMSrwDSVbFQkuDPIfq4fo1A25rsyULR57vy7XKA51OstX
+GvREPDhth4cMZjthq0f8AVzPq2vIk8Po65uvKR190yupPQ4FhvGeRkHkqp+SqoIJ
+lClD8xZEHrUHSYZotm5TLWIgSwa4DuO1q3bMRI8oIWzqhv99FtlmHlC8fjVUN4mR
+2czhABr0u6RMPOtJwTVxWgT1PKXiLWfmeHb63TcPYGgpJ39iMDOjtgY9jYueoO8J
+uGJJtkGRIRjOuhDFE9NUlNnljUxUDWvMU7zCO4ozaKMZgoxr1WoIO6ubI/003I53
+sZ0Q5h8yfz+QreEw3wzjxnQSkejG5c3NIvJSiu0ylOqDWmnj0v1Jv/P0qAMU4bt/
+ZWj0GOrYfPn9STg0VxMOQwQ2o15GAcbr6PFI56U2IJhZAeER3hIe2kOl6591jQ67
+zvOjPRRh2q05Ss8yo7nEpYUiB/FrE6RssJ5tVwX6e6Tq4Z1frINanIkUkToTkypP
+Fn2T/KV2lak9rLuxzvhiDobu5iGCR323zFcFEpGq4Wsopx1uRT9+71G/ejw8pKTf
+kQ7XiGaaxFyZuMuOz3bFkTuoTmAkUQTlRjGw2DmKZi/apcN+VQgpq9tQpS10pEUy
+DCVdtw1AdlOnwb+Hf3X0Uz6OjwIDAQABoyEwHzAdBgNVHQ4EFgQUqLBlSlnqCo25
+sIduMPm4iROMqkAwDQYJKoZIhvcNAQENBQADggIBAGWv8rDTzqhHkjqDOT+Ba2bs
+gVddpCNa94RQoOn2DUSu4c+yuWJLSctjpX7gswB6qvWk5Ojfafop8jJW8zuozJrO
+76b9345S/VnnbHVSoVfIpF9Fve1Xc8nvU4ylRcAMwhf8N3Md5Yc1kb+P7NtTTwMZ
+TBR3xY3fVxv3qTpKApWQKkUiqM7yJKOfS8xcK/pjO/3oRUwfA9DHugCUpgSidlN+
+JkZmgwAcA3/WMlDdNKmKnWLGB2Ea+W6kIx5TDFfjf11rbjuwXhDLyaOK88qlN0W2
+hYa31UDSEYYQd3gMG1gjVc+9vZA/Vr0+SF5ULN9QLjB18CVIdPv92mBjJQRmJSVW
+b1qwZI0jf/V+1fu9H9r7sE4CId3+WGOek3UNRNZLOVZCSiFq/b9cswcQZGjw6aE+
+1FNjw1HW9CLoNcg74Kr98QouOoeRSofQYZiYqaM9Sz/MsinYMIRGRGw3Uq1uNRo0
+WgoOngmZSKGaW5PFR19uuuNIVB4fCShqBVyrguW4xIskta1JVFoggFeOeTwk6/kH
+S5roMzyB/kzv83A2IB0VxqbiDj8khgdm1Us6HCCmU+iTRVyG28gFklCJ8dQfxgGH
+W2gpIwvxYLyNP14/7E1oF7/NfHmyjAVzYnR5Xw2wE4tvSHuIrHhj6Q26VB3vze6j
+E/w1AJEepnw/KfHqS3bw
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/reseed/zmx_at_mail.i2p.crt b/osx/i2pd/certificates/reseed/zmx_at_mail.i2p.crt
new file mode 100644
index 0000000..41f4cc7
--- /dev/null
+++ b/osx/i2pd/certificates/reseed/zmx_at_mail.i2p.crt
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+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
+fNr8P7NIRyZ8
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/router/killyourtv_at_mail.i2p.crt b/osx/i2pd/certificates/router/killyourtv_at_mail.i2p.crt
new file mode 100644
index 0000000..597f455
--- /dev/null
+++ b/osx/i2pd/certificates/router/killyourtv_at_mail.i2p.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFhTCCA22gAwIBAgIELuRWgDANBgkqhkiG9w0BAQ0FADBzMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEcMBoGA1UEAwwTa2lsbHlvdXJ0dkBt
+YWlsLmkycDAeFw0xMzEwMDYyMTM5MzFaFw0yMzEwMDYyMTM5MzFaMHMxCzAJBgNV
+BAYTAlhYMQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBB
+bm9ueW1vdXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRwwGgYDVQQDDBNraWxseW91
+cnR2QG1haWwuaTJwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAig3u
+niLWm0y/TFJtciHgmWUt20FOdQrxkiSZ87G8xjuGfq7TbGIiVDn7pQZcHidpq+Dk
+47sm+Swqhb4psSijj0AXUEVKlV39jF5IZE+VUgmEtMqQbnBkWudaTJPWcEe9T/Kd
+8Oz2jgsnrD/EGVTMKBBjt/gk8VqTWvpCdCF1GhqcCeUTFHzjhN9jtoRCaJ2DClpO
+Px+86+d3s9PqUFo8gcD/dbbyJCMqUCMBLtIy/Ooouxb9cfWtXfyOlphU+enmdvuA
+0BDewb9pOJg2/kVd9/9moDWcBGChLOlfSlxpDwyUtcclcpvwnG7c6o4or6gqLeOf
+AbCpse623utV7fWlFWG7M4AQ/2emhhe4YoMJQnflydzV8bPRJxRTeW1j/9UfpvLT
+nO5LHp0oBXE0GqAPjxuAr+r5IDXFbkKYNjK5oWQB/Ul3LkexulYdCzHWbGd1Ja5b
+sbiOy6t/hH6G8DD75HYb+PQZaNZWBv90EyOq1JDSUPw6nxVbhiBldi3ipc8/1X51
+FbzBqJ+QO1XKrKqxWxBKoTekuy38KRzsmkSCpY+WJ9f0gLOKtxzVO2HNNqqVFGQf
+RGIbrNA0JSRQ1fgelccfrcRIXIZ3B8Tk/wxCIzCY6Yvg2jezz2xJkVdqOUsznS2v
++xJe67PYIAeMVtcfO4kmuCvyIYhsUEpob2n/5lkCAwEAAaMhMB8wHQYDVR0OBBYE
+FCLneov6QMtvra5FSoSLhdymi++rMA0GCSqGSIb3DQEBDQUAA4ICAQAIcqbiwjdQ
+M9VlGBiHe5eVsL6OM9zfRqR1wnRg4Q6ce65XDfEOYleBWaaNJA4BdykcA4fkUN1h
+M2D9FDQScsyPTOuzJ6o75TYh0JOtF51yCi9iuemcosxAwsm90ZXGuMDfDYeyND5c
+PAkWfyCP+jwLYbNo/hkNqyv+XWHXPQmT2adRnPXINVUQuBxVPC//C9wv2uDYWhgS
+f8M425VPp4/R/uks9mlzTx08DwacvouD0YOC+HZE4sWq+2smgeBInMiyr/THYzl+
+baMtYgVs8IKUD2gtjfXZoaQNg3eq5SedSf/5F0S/LCdu9/ccQ8CzSEoVTiQFtO78
+SaU37xai8+QTSVpPuINigxCoXmkubBd+voEmWRcBd/XB5L+u+MFU/jXyyBj2BXVj
+6agqVzY53KVYt23/63QliAUWyxT+ns9gRxVN1jrMhHdiDwsdT4NbzHxg1Su4eiHv
+C/wjD3Dga0BRTEGylpHZGzb1U1rZRHM3ho3f1QkmRPPLcBUMTyUTxJm+GEeuhPvp
++TBf3Kg/YkdpnEMlagqcyHuIrf3m8Z/pTmpOIbekJWbbA7tluvWbMWw2ARB7dUOE
+fHYVISh0DTw2oVXxM82/q8XXHnhEXv2nW3K40x1VabxUN+sF4M/7YA8nJqwsPJei
+749STYJRfZXdIe69M9zpM5unxENAsiPJgQ==
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/router/orignal_at_mail.i2p.crt b/osx/i2pd/certificates/router/orignal_at_mail.i2p.crt
new file mode 100644
index 0000000..c1229f3
--- /dev/null
+++ b/osx/i2pd/certificates/router/orignal_at_mail.i2p.crt
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFVDCCAzwCCQC2r1XWYtqtAzANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQGEwJY
+WDELMAkGA1UECAwCWFgxCzAJBgNVBAcMAlhYMRMwEQYDVQQKDApQdXJwbGUgSTJQ
+MQ0wCwYDVQQLDARJMlBEMR8wHQYJKoZIhvcNAQkBFhBvcmlnbmFsQG1haWwuaTJw
+MB4XDTE1MDIyMjEzNTgxOFoXDTI1MDIxOTEzNTgxOFowbDELMAkGA1UEBhMCWFgx
+CzAJBgNVBAgMAlhYMQswCQYDVQQHDAJYWDETMBEGA1UECgwKUHVycGxlIEkyUDEN
+MAsGA1UECwwESTJQRDEfMB0GCSqGSIb3DQEJARYQb3JpZ25hbEBtYWlsLmkycDCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALp3D/gdvFjrMm+IE8tHZCWE
+hQ6Pp0CCgCGDBC3WQFLqR98bqVPl4UwRG/MKY/LY7Woai06JNmGcpfw0LMoNnHxT
+bvKtDRe/8kQdhdLHhgIkWKSbMvTAl7uUdV6FzsPgDR0x7scoFVWEhkF0wfmzGF2V
+yr/WCBQejFPu69z03m5tRQ8Xjp2txWV45RawUmFu50bgbZvLCSLfTkIvxmfJzgPN
+pJ3sPa/g7TBZl2uEiAu4uaEKvTuuzStOWCGgFaHYFVlTfFXTvmhFMqHfaidtzrlu
+H35WGrmIWTDl6uGPC5QkSppvkj73rDj5aEyPzWMz5DN3YeECoVSchN+OJJCM6m7+
+rLFYXghVEp2h+T9O1GBRfcHlQ2E3CrWWvxhmK8dfteJmd501dyNX2paeuIg/aPFO
+54/8m2r11uyF29hgY8VWLdXtqvwhKuK36PCzofEwDp9QQX8GRsEV4pZTrn4bDhGo
+kb9BF7TZTqtL3uyiRmIyBXrNNiYlA1Xm4fyKRtxl0mrPaUXdgdnCt3KxOAJ8WM2B
+7L/kk9U8C/nexHbMxIZfTap49XcUg5dxSO9kOBosIOcCUms8sAzBPDV2tWAByhYF
+jI/Tutbd3F0+fvcmTcIFOlGbOxKgO2SfwXjv/44g/3LMK6IAMFB9UOc8KhnnJP0f
+uAHvMXn1ahRs4pM1VizLAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAIOxdaXT+wfu
+nv/+1hy5T4TlRMNNsuj79ROcy6Mp+JwMG50HjTc0qTlXh8C7nHybDJn4v7DA+Nyn
+RxT0J5I+Gqn+Na9TaC9mLeX/lwe8/KomyhBWxjrsyWj1V6v/cLO924S2rtcfzMDm
+l3SFh9YHM1KF/R9N1XYBwtMzr3bupWDnE1yycYp1F4sMLr5SMzMQ0svQpQEM2/y5
+kly8+eUzryhm+ag9x1686uEG5gxhQ1eHQoZEaClHUOsV+28+d5If7cqcYx9Hf5Tt
+CiVjJQzdxBF+6GeiJtKxnLtevqlkbyIJt6Cm9/7YIy/ovRGF2AKSYN6oCwmZQ6i1
+8nRnFq5zE7O94m+GXconWZxy0wVqA6472HThMi7S+Tk/eLYen2ilGY+KCb9a0FH5
+5MOuWSoJZ8/HfW2VeQmL8EjhWm5F2ybg28wgXK4BOGR3jQi03Fsc+AFidnWxSKo0
+aiJoPgOsfyu8/fnCcAi07kSmjzUKIWskApgcpGQLNXHFK9mtg7+VA8esRnfLlKtP
+tJf+nNAPY1sqHfGBzh7WWGWal5RGHF5nEm3ta3oiFF5sMKCJ6C87zVwFkEcRytGC
+xOGmiG1O1RPrO5NG7rZUaQ4y1OKl2Y1H+nGONzZ3mvoAOvxEq6JtUnU2kZscpPlk
+fpeOSDoGBYJGbIpzDreBDhxaZrwGq36k
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/router/str4d_at_mail.i2p.crt b/osx/i2pd/certificates/router/str4d_at_mail.i2p.crt
new file mode 100644
index 0000000..b01c7e3
--- /dev/null
+++ b/osx/i2pd/certificates/router/str4d_at_mail.i2p.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFezCCA2OgAwIBAgIEHLJfZzANBgkqhkiG9w0BAQ0FADBuMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOc3RyNGRAbWFpbC5p
+MnAwHhcNMTMxMDI2MTExODQxWhcNMjMxMDI2MTExODQxWjBuMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOc3RyNGRAbWFpbC5p
+MnAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvw0vTay1IPOgxvwe8
+yt5jGakha20kw9qDb6zbEL87EWEkeOzdu7iUC69lkxVP9Ws8EbLtkeMf/CXg6CC1
+e+w8WpOHj5prOsiOlrIO+2I1tKMaMUuJDX2wK4I5ZSw/Kieimh9xqOBZknDmtwjw
+2HPW8rpxMqrScaGAP6sQD8Gh4XKKkLogfxYPzF8NnC6O8vBkFKVU2WSVZ0jPAQfv
+6luPdA+5lES+5UPWr9Yhv/CX4siGKUTxchqJRf2VU4o5BzzXae4asVA/NY7lKgEw
+eDDufbm0mRFWP4mbmXRlODuJ8GMnJbMQkNcAvZUnUcvpSTnGnIvxyxtXP5P6ic8V
+3b9HV2eIsbfO1xrgyr6/9qgGpXcdDJejhvNg6fZgQeO40bOGQYwV8bNvsNQHqnZl
+KsVhsMQkOubMxcHTBadcifi8PmdeJ5hxyyqJmyrwkmg2ijnN521M6YkoBzl+8VAi
+zLmqKZfvN5t+pb9PZ3U3jHfkeIEwDRYRAOsvVqch5+ZfSv8x/Te6o15zDKPJQtWK
+ty42GV1vERw30oSZQdrRRy/+4+HSRs3/Zb368OdAbcr+f/xPvwceYGWPeNNIoZ/x
+xkIQE3xgEK+eJyPM9McjlCAezZZclT7fWfiEYNJAiS3fGALi+a+cGYWWULxCXpz+
+y397OHhZBhnh7D9K8aPePB8tCwIDAQABoyEwHzAdBgNVHQ4EFgQUezvGHq3h1gbC
+Hs2LLVoll5fIUWMwDQYJKoZIhvcNAQENBQADggIBAF7SG1WBcE1r5eyTp/BLFZfG
+iPtvqu+B1L2HutPum/Xf8A5fxR4kcKAKpVdu6vnDzCRAsAC9YvyETgAzI2nfVgLk
+l9YZ31tSi6qxnMsQsV5o9lt/q2Rvsf2Zi/Ir8AlWtvnP8YG0Aj/8AG8MyhMLaIdj
+M2FuakPs8RqEjoJL9dTOC9VTQpNTwBH9guP9UalWYwlkaXDzMoyO4nswT/GpCpg8
+4m4RO6grzdsEIamD/PCBM5f/vq+y08GaqfXpX9+8CbaX3tdzd3x48wPphmdpkptk
+aRELIpLJZiK+Mos7W+0ZS8SHxGDIosjqVsgbZPmk12+VBcVgLOr8W1D7osS4OY59
+2GMUVV/GhoDh8wR/Td5wpZlcPE0NWmljjVg9+1E8ePAyMZy+U1KCiMlRVdRy518O
+dOzzUUQGqGQHosRrH0ypS3MGbMLmbuWFRiz7q/3mUmW2xikH9I1t/6ZMNUvh+IWL
+kGAaEf2JIv/D8+QsC0Un1W09DgvYz7qmKSeHhBixlLe68vgXtz/Fa+rRMsmPrueo
+4wk/u/VyILo0BJP860APJMZbm+DPfGhV9DF9L5Gx9+d/BlduBVGHc+AQSWbU70dS
+eH4/rgUYRikWlgwUxjY8/QQTlfx5xl28tG0xdO9libN22z7UwTGfm48BQIdrTyER
+hqQ7usTy3oaWD85MbJ0q
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/certificates/router/zzz_at_mail.i2p.crt b/osx/i2pd/certificates/router/zzz_at_mail.i2p.crt
new file mode 100644
index 0000000..2d6fcba
--- /dev/null
+++ b/osx/i2pd/certificates/router/zzz_at_mail.i2p.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFdzCCA1+gAwIBAgIEcwrwsjANBgkqhkiG9w0BAQ0FADBsMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEVMBMGA1UEAwwMenp6QG1haWwuaTJw
+MB4XDTEzMDkzMDE3NDEyNVoXDTIzMDkzMDE3NDEyNVowbDELMAkGA1UEBhMCWFgx
+CzAJBgNVBAgTAlhYMQswCQYDVQQHEwJYWDEeMBwGA1UEChMVSTJQIEFub255bW91
+cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAxFTATBgNVBAMMDHp6ekBtYWlsLmkycDCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJV4ptvhlfrcize9/ARz4lUy
+iLtLMSvSST1BdZjLJTwus05EUs0oiqnv9qXYIWGRB97aKlAmqSxsn4ZgBttCgmev
+IkuiZ8kbdqI5YaT98yKW5P2Prt9p9cPbnz5/qjwZ5L9W+k/Itx7bv2pkNEP0NLYo
+NrgHHTb1hsyRxc0lfPYk2BwsIi8hIWBHNrRpR41EWFXfqPcdsxS8cQhxVj4zLG/R
+aMm4H8T+V1R1Khl4R4qqRgXBP305xqqRoawHmZ/S9/RkF0Ji6IYwBq9iWthWol6W
+sMDn1xhZk9765fk+ohAC2XWuGSFCr02JOILRV3x/8OUxT1GYgYjc7FfyWIekg/pZ
+yotlhL2I3SMWOH3PdG58iDY121hq/LsSKM9aP20rwtvssnw+8Aex01YDkI3bM6yO
+HNi+tRojaJcJciBWv6cuiFKvQdxj/mOhOr0u0lHLlJ4jqES8uvVJkS7X/C4BB7ra
+bJYQgumZMYvVQJFIjo8vZxMXue53o65FRidvAUT29ay54UTiL7jRV9w1wHnzLapU
+xT1v7kWpWJcZ1zzC8coJjW+6ijkk38cVLb80u1Q4kEbmP2rDxw6jRvmqg6DcCKjK
+oqDt+XQ6P5grxAxLT+VMfB404WHHwNs6BB841//4ZnXvy3msMONY/5y0fsblURgh
+IS2UG1TAjR+x7+XikGx9AgMBAAGjITAfMB0GA1UdDgQWBBSvx/fCCP8UeHwjN65p
+EoHjgRfiIzANBgkqhkiG9w0BAQ0FAAOCAgEAYgVE1Aa/Ok5k+Jvujbx72bktRWXo
+Y4UfbWH/426VdgqXt3n9XtJUNM2oI4ODwITM4O15SyXQTLJhnvJz5ELcJV8nqviZ
+RjK2HNX1BW7IEta3tacCvVnjzZ265kCT59uW+qmd+5PiaAYI5lYUn8P6pe+6neSa
+HW6ecXCrdxJetSYfUUuKeV6YHpdzfjtZClLmwl91sJUBKcjK+Q9G/cE6HnwcDH1s
+uXr7SgkBt/qc/OlNuu4fnTqUA58TAumdq9cD+eLBilDFrux1HsUZMuBUp64x5oPi
+gme+3VewsczfFEtrxaG6+l6UA40Lerdx9XECZcDCcFsK6MS1uQ2HYjsyZcWnNT3l
+6eDNUbjrllwxDdRAk0cbWiMuc21CFq/1v2QMXk88EiBjEajqzyXUPmKzwFhit6pr
+5kfjfXNq+pxQSCoaqjpzVKjb3CqMhSlC8cLgrPw6HEgGnjCy4cTLFHlVmD64M778
+tj6rE7CntcmUi8GKmZKyaMyUo3QQUcrjO5IQ4+3iGUgMkZuujyjrZiOJbvircPmK
+4IQEXzJ/G00upqtqKstRybaWSbJ/k6iuturtA2n8MJiCBjhLy8dtTgDbFaDaNF7F
+NHeqQjIJDLhYDy6mi4gya3A0ort777Inl/rWYLo067pYM+EWDw66GdpbEIB0Bp71
+pwvcQcjIzbUzEK0=
+-----END CERTIFICATE-----
diff --git a/osx/i2pd/i2pd b/osx/i2pd/i2pd
new file mode 100755
index 0000000..bcf28ae
--- /dev/null
+++ b/osx/i2pd/i2pd
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Copyright (c) 2013-2017, The PurpleI2P Project
+#
+# This file is part of Purple i2pd project and licensed under BSD3
+#
+# See full license text in LICENSE file at top of project tree
+
+screenfind=$(which screen)
+if [ -z $screenfind ]; then
+ echo "Can't find 'screen' installed. That script needs it!";
+ exit 1;
+fi
+
+screen -Adm -S i2pd ./i2pd-osx --datadir=.
diff --git a/osx/i2pd_2.16.0_osx/i2pd b/osx/i2pd/i2pd-osx
similarity index 55%
rename from osx/i2pd_2.16.0_osx/i2pd
rename to osx/i2pd/i2pd-osx
index 88834d3..e75a215 100755
Binary files a/osx/i2pd_2.16.0_osx/i2pd and b/osx/i2pd/i2pd-osx differ
diff --git a/osx/i2pd/i2pd.conf b/osx/i2pd/i2pd.conf
new file mode 100644
index 0000000..5a46a78
--- /dev/null
+++ b/osx/i2pd/i2pd.conf
@@ -0,0 +1,44 @@
+## Configuration file for a typical i2pd user
+## See https://i2pd.readthedocs.org/en/latest/configuration.html
+## for more options you can use in this file.
+
+#log = file
+#logfile = ./i2pd.log
+
+ipv4 = true
+ipv6 = false
+
+bandwidth = O
+
+[precomputation]
+elgamal = true
+
+[upnp]
+enabled = true
+name = I2Pd
+
+[reseed]
+verify = true
+
+[addressbook]
+subscriptions = http://inr.i2p/export/alive-hosts.txt
+
+[http]
+enabled = true
+address = 127.0.0.1
+port = 7070
+
+[httpproxy]
+enabled = true
+address = 127.0.0.1
+port = 4444
+
+[socksproxy]
+enabled = true
+address = 127.0.0.1
+port = 4447
+
+[sam]
+enabled = true
+address = 127.0.0.1
+port = 7656
diff --git a/osx/i2pd_2.16.0_osx/libSystem.B.dylib b/osx/i2pd/libSystem.B.dylib
similarity index 100%
rename from osx/i2pd_2.16.0_osx/libSystem.B.dylib
rename to osx/i2pd/libSystem.B.dylib
diff --git a/osx/i2pd_2.16.0_osx/libc++.1.dylib b/osx/i2pd/libc++.1.dylib
similarity index 100%
rename from osx/i2pd_2.16.0_osx/libc++.1.dylib
rename to osx/i2pd/libc++.1.dylib
diff --git a/osx/i2pd_2.16.0_osx/libz.1.dylib b/osx/i2pd/libz.1.dylib
similarity index 100%
rename from osx/i2pd_2.16.0_osx/libz.1.dylib
rename to osx/i2pd/libz.1.dylib
diff --git a/osx/i2pd/tunnels.conf b/osx/i2pd/tunnels.conf
new file mode 100644
index 0000000..756f861
--- /dev/null
+++ b/osx/i2pd/tunnels.conf
@@ -0,0 +1,33 @@
+#[IRC]
+#type = client
+#address = 127.0.0.1
+#port = 6668
+#destination = irc.postman.i2p
+#destinationport = 6667
+#keys = irc-keys.dat
+
+#[SMTP]
+#type = client
+#address = 127.0.0.1
+#port = 7659
+#destination = smtp.postman.i2p
+#destinationport = 25
+#keys = smtp-keys.dat
+
+#[POP3]
+#type = client
+#address = 127.0.0.1
+#port = 7660
+#destination = pop.postman.i2p
+#destinationport = 110
+#keys = pop3-keys.dat
+
+#[MTN]
+#type = client
+#address = 127.0.0.1
+#port = 8998
+#destination = mtn.i2p-projekt.i2p
+#destinationport = 4691
+#keys = mtn-keys.dat
+
+# see more examples in /usr/share/doc/i2pd/configuration.md.gz
diff --git a/osx/run.sh b/osx/run.sh
deleted file mode 100644
index f0fb630..0000000
--- a/osx/run.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-cp ./syspref.js ./*.i2pdbb/prefs.js
-./FirefoxESR.app/Contents/MacOS/firefox -profile ./*.i2pdbb
diff --git a/windows/build/i2pd/i2pd.conf b/windows/build/i2pd/i2pd.conf
index bc7d026..5a46a78 100644
--- a/windows/build/i2pd/i2pd.conf
+++ b/windows/build/i2pd/i2pd.conf
@@ -20,6 +20,9 @@ name = I2Pd
[reseed]
verify = true
+[addressbook]
+subscriptions = http://inr.i2p/export/alive-hosts.txt
+
[http]
enabled = true
address = 127.0.0.1
@@ -38,4 +41,4 @@ port = 4447
[sam]
enabled = true
address = 127.0.0.1
-port = 7656
\ No newline at end of file
+port = 7656
diff --git a/windows_prebuilt/I2Pd/i2pd.conf b/windows_prebuilt/I2Pd/i2pd.conf
index bc7d026..5a46a78 100644
--- a/windows_prebuilt/I2Pd/i2pd.conf
+++ b/windows_prebuilt/I2Pd/i2pd.conf
@@ -20,6 +20,9 @@ name = I2Pd
[reseed]
verify = true
+[addressbook]
+subscriptions = http://inr.i2p/export/alive-hosts.txt
+
[http]
enabled = true
address = 127.0.0.1
@@ -38,4 +41,4 @@ port = 4447
[sam]
enabled = true
address = 127.0.0.1
-port = 7656
\ No newline at end of file
+port = 7656