tbb-commits
Threads by month
- ----- 2025 -----
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 1 participants
- 18498 discussions

[tor-browser-build/master] Bug 29632: Use HTTPS for downloading Gradle
by boklm@torproject.org 03 Mar '19
by boklm@torproject.org 03 Mar '19
03 Mar '19
commit 1e09514cd1bfdeba863a84929edfc21ede3f8b9d
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Mar 1 19:08:03 2019 +0000
Bug 29632: Use HTTPS for downloading Gradle
There should be no excuse anymore to use plan HTTP (even though, we
check the SHA-256 sum). Use HTTPS where possible.
---
projects/android-toolchain/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config
index c14f90e..8a4c413 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -33,6 +33,6 @@ input_files:
- URL: '[% c("var/google_repo") %]/android-ndk-r15c-linux-x86_64.zip'
name: android_ndk_compiler
sha256sum: f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c
- - URL: http://services.gradle.org/distributions/gradle-4.1-bin.zip
+ - URL: https://services.gradle.org/distributions/gradle-4.1-bin.zip
name: gradle_bin
sha256sum: d55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43
1
0
commit 95f303b383fabb0904545a2c5b8150476270e2d0
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Mar 1 07:05:02 2019 +0000
Add missing parenthesis
---
projects/firefox/build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/firefox/build b/projects/firefox/build
index aa0a34f..f3d3c27 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -113,7 +113,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig
tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %]
[% END %]
-eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]
+eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %])
if [ -z $MOZ_BUILD_DATE ]
then
echo "MOZ_BUILD_DATE is not set"
1
0

[tor-browser-build/master] Bug 28685: Set Build ID based on Tor Browser version
by gk@torproject.org 28 Feb '19
by gk@torproject.org 28 Feb '19
28 Feb '19
commit d11f03f7c10c2cf5a942a353d0961249ceee9644
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Wed Feb 20 20:15:19 2019 +0100
Bug 28685: Set Build ID based on Tor Browser version
---
projects/firefox/build | 2 +-
projects/firefox/get-moz-build-date | 26 +++++++++++++++++---------
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/projects/firefox/build b/projects/firefox/build
index 1544c11..aa0a34f 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -113,7 +113,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig
tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %]
[% END %]
-eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt))
+eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]
if [ -z $MOZ_BUILD_DATE ]
then
echo "MOZ_BUILD_DATE is not set"
diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date
index fb7298a..4e55c92 100755
--- a/projects/firefox/get-moz-build-date
+++ b/projects/firefox/get-moz-build-date
@@ -1,16 +1,24 @@
#!/usr/bin/perl -w
-# Generate a MOZ_BUILD_DATE based on firefox version number
+# Generate a MOZ_BUILD_DATE based on Tor Browser version number
use strict;
die "wrong number of arguments" unless @ARGV == 2;
my ($year, $version) = @ARGV;
-$version =~ s/\D+$//;
-my @v = split(/[\.ab]/, $version);
-push @v, '0' if @v < 4;
-push @v, '0' if @v < 4;
-my $day_of_month = int(($v[0] - 45) / 5);
-my $date = 101010101 + $year * 10000000000 + $day_of_month * 1000000
- + $v[1] * 10000 + $v[2] * 100 + $v[3];
-$date += 100000000 unless $version =~ m/[ab]/;
+my $date;
+if ($version eq 'tbb-nightly') {
+ my (undef, undef, undef, $day, $mon, $y) = localtime;
+ $date = sprintf("%d%02d%02d010101", $y + 1900, $mon + 1, $day);
+} else {
+ my @v = split(/[\.ab]/, $version);
+ push @v, '0' if @v < 4;
+ push @v, '0' if @v < 4;
+ # When MOZ_BUILD_DATE was based on the firefox version, with
+ # Tor Browser 8.0.6 and firefox 60.5.1 it was 20190204060201
+ # We can remove 5 from the month, while keeping it increasing.
+ my $month = $v[0] - 5;
+ $date = 1010101 + $year * 10000000000 + $month * 100000000
+ + $v[1] * 1000000 + $v[2] * 10000 + $v[3];
+ $date += 1000000 unless $version =~ m/[ab]/;
+}
print "export MOZ_BUILD_DATE=$date\n";
1
0

[tor-browser-build/master] Bug 29579: Fix typo in projects/tor/build
by gk@torproject.org 25 Feb '19
by gk@torproject.org 25 Feb '19
25 Feb '19
commit 0403da4390f8891a5a082eb6c761cd8710f913ca
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Mon Feb 25 15:45:13 2019 +0100
Bug 29579: Fix typo in projects/tor/build
---
projects/tor/build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/projects/tor/build b/projects/tor/build
index f063693..d6018d9 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -11,7 +11,7 @@ mkdir -p /var/tmp/build
[% END %]
[% IF c("var/osx") %]
- [% IF ("var/nightly") %]
+ [% IF c("var/nightly") %]
# We are compiling Tor with Rust enabled for nightlies.
export TOR_RUST_TARGET=x86_64-apple-darwin
[% END %]
@@ -33,7 +33,7 @@ libeventdir=/var/tmp/dist/libevent
openssldir=/var/tmp/dist/openssl
[% IF c("var/windows") %]
- [% IF ("var/nightly") %]
+ [% IF c("var/nightly") %]
# We are compiling Tor with Rust enabled for nightlies.
export TOR_RUST_TARGET=[% c("arch") %]-pc-windows-gnu
[% END %]
1
0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Revert "Bug 29180: MAR download stalls when about dialog is opened""
by gk@torproject.org 25 Feb '19
by gk@torproject.org 25 Feb '19
25 Feb '19
commit 5a0ac465ad739e62dc0c2e9887a15f146e9415a8
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Feb 25 07:45:23 2019 +0000
Revert "Revert "Bug 29180: MAR download stalls when about dialog is opened""
This reverts commit fcc53d9fa4969850b4cd77951974ee6db73e827b.
---
browser/base/content/aboutDialog-appUpdater.js | 17 +++++++++++-----
toolkit/mozapps/update/content/updates.js | 27 ++++++++++++++------------
2 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js
index e81098a1e898..b732db6bee6b 100644
--- a/browser/base/content/aboutDialog-appUpdater.js
+++ b/browser/base/content/aboutDialog-appUpdater.js
@@ -318,11 +318,18 @@ appUpdater.prototype =
this.update.QueryInterface(Ci.nsIWritablePropertyBag);
this.update.setProperty("foregroundDownload", "true");
- this.aus.pauseDownload();
- let state = this.aus.downloadUpdate(this.update, false);
- if (state == "failed") {
- this.selectPanel("downloadFailed");
- return;
+ // If one is not already in progress, start a download. Previously,
+ // we would pause and restart an existing download in case there was
+ // a need to transition from a background download to a foreground one,
+ // but that caused Tor bug 29180. There is no difference between a
+ // foreground and background download unless the update manifest
+ // includes a backgroundInterval attribute.
+ if (!this.isDownloading) {
+ let state = this.aus.downloadUpdate(this.update, false);
+ if (state == "failed") {
+ this.selectPanel("downloadFailed");
+ return;
+ }
}
this.setupDownloadingUI();
diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js
index 5b6ae7cc6ba1..195265ff81f9 100644
--- a/toolkit/mozapps/update/content/updates.js
+++ b/toolkit/mozapps/update/content/updates.js
@@ -751,19 +751,22 @@ var gDownloadingPage = {
gUpdates.update.QueryInterface(Ci.nsIWritablePropertyBag);
gUpdates.update.setProperty("foregroundDownload", "true");
- // Pause any active background download and restart it as a foreground
- // download.
- aus.pauseDownload();
- var state = aus.downloadUpdate(gUpdates.update, false);
- if (state == "failed") {
- // We've tried as hard as we could to download a valid update -
- // we fell back from a partial patch to a complete patch and even
- // then we couldn't validate. Show a validation error with instructions
- // on how to manually update.
- this.cleanUp();
- gUpdates.wiz.goTo("errors");
- return;
+ // If it is not already in progress, start the download. See
+ // Tor bug 29180 as well as the longer comment in the startDownload()
+ // function within browser/base/content/aboutDialog-appUpdater.js.
+ if (!aus.isDownloading) {
+ var state = aus.downloadUpdate(gUpdates.update, false);
+ if (state == "failed") {
+ // We've tried as hard as we could to download a valid update -
+ // we fell back from a partial patch to a complete patch and even
+ // then we couldn't validate. Show a validation error with
+ // instructions on how to manually update.
+ this.cleanUp();
+ gUpdates.wiz.goTo("errors");
+ return;
+ }
}
+
// Add this UI as a listener for active downloads
aus.addDownloadListener(this);
1
0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Revert "Bug 28885: notify users that update is downloading""
by gk@torproject.org 25 Feb '19
by gk@torproject.org 25 Feb '19
25 Feb '19
commit 4f79cf20b45acc657639f620d03f24b38f8e7bf1
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Feb 25 07:45:02 2019 +0000
Revert "Revert "Bug 28885: notify users that update is downloading""
This reverts commit 58a439dd4e6fc1734d60d7175caa1cb2f88fbbac.
---
browser/app/profile/000-tor-browser.js | 1 +
.../customizableui/content/panelUI.inc.xul | 1 +
.../components/customizableui/content/panelUI.js | 28 ++++++++++++++++++++++
browser/components/nsBrowserGlue.js | 1 +
.../themes/shared/customizableui/panelUI.inc.css | 1 +
browser/themes/shared/toolbarbutton-icons.inc.css | 1 +
toolkit/mozapps/update/UpdateListener.jsm | 23 ++++++++++++++++++
toolkit/mozapps/update/nsUpdateService.js | 28 ++++++++++++++++++++++
8 files changed, 84 insertions(+)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 11027f4c9a3a..9f1e727ce724 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -20,6 +20,7 @@ pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags
// Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog
pref("app.update.promptWaitTime", 3600);
pref("app.update.badge", true);
+pref("app.update.notifyDuringDownload", true);
pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues
#ifdef XP_WIN
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 5891556a6e5f..ee4f8351d02b 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -172,6 +172,7 @@
<vbox id="appMenu-addon-banners"/>
<toolbarbutton class="panel-banner-item"
label-update-available="&updateAvailable.panelUI.label;"
+ label-update-downloading="Downloading update"
label-update-manual="&updateManual.panelUI.label;"
label-update-restart="&updateRestart.panelUI.label2;"
oncommand="PanelUI._onBannerItemSelected(event)"
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 5233be130be2..a4018bb2e6c2 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -46,6 +46,7 @@ const PanelUI = {
init() {
this._initElements();
+ this._initUpdaterStrings();
this.menuButton.addEventListener("mousedown", this);
this.menuButton.addEventListener("keypress", this);
@@ -53,6 +54,7 @@ const PanelUI = {
Services.obs.addObserver(this, "fullscreen-nav-toolbox");
Services.obs.addObserver(this, "appMenu-notifications");
+ Services.obs.addObserver(this, "show-update-progress");
XPCOMUtils.defineLazyPreferenceGetter(this, "autoHideToolbarInFullScreen",
"browser.fullscreen.autohide", false, (pref, previousValue, newValue) => {
@@ -120,6 +122,28 @@ const PanelUI = {
}
},
+ _initUpdaterStrings() {
+ // If Torbutton is installed and enabled, replace the "Downloading update"
+ // string with one from torbutton.properties (to facilitate localization).
+ try {
+ let brands = Services.strings.createBundle(
+ "chrome://branding/locale/brand.properties");
+ let stringArgs = [brands.GetStringFromName("brandShortName")];
+ let torbuttonBundle = Services.strings.createBundle(
+ "chrome://torbutton/locale/torbutton.properties");
+ let label = torbuttonBundle.formatStringFromName(
+ "updateDownloadingPanelUILabel", stringArgs, 1);
+ let attrName = "label-update-downloading";
+ let elements = document.getElementsByClassName("panel-banner-item");
+ for (let i = 0; i < elements.length; ++i) {
+ let elem = elements.item(i);
+ if (elem.hasAttribute(attrName)) {
+ elem.setAttribute(attrName, label);
+ }
+ }
+ } catch (e) {}
+ },
+
_eventListenersAdded: false,
_ensureEventListenersAdded() {
if (this._eventListenersAdded)
@@ -152,6 +176,7 @@ const PanelUI = {
Services.obs.removeObserver(this, "fullscreen-nav-toolbox");
Services.obs.removeObserver(this, "appMenu-notifications");
+ Services.obs.removeObserver(this, "show-update-progress");
window.removeEventListener("MozDOMFullscreen:Entered", this);
window.removeEventListener("MozDOMFullscreen:Exited", this);
@@ -252,6 +277,9 @@ const PanelUI = {
this._notifications = AppMenuNotifications.notifications;
this._updateNotifications(true);
break;
+ case "show-update-progress":
+ openAboutDialog();
+ break;
}
},
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 0ec10a3337d4..e68817fd3c7c 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -187,6 +187,7 @@ const global = this;
const listeners = {
observers: {
+ "update-downloading": ["UpdateListener"],
"update-staged": ["UpdateListener"],
"update-downloaded": ["UpdateListener"],
"update-available": ["UpdateListener"],
diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css
index 75946aa5f082..4cb2032a09d1 100644
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -62,6 +62,7 @@
}
#PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
+#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
#PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
#PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center;
diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css
index d3a634d5ff51..230ddf951858 100644
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -259,6 +259,7 @@ toolbar[brighttext] {
}
#PanelUI-menu-button[badge-status="update-available"],
+#PanelUI-menu-button[badge-status="update-downloading"],
#PanelUI-menu-button[badge-status="update-manual"],
#PanelUI-menu-button[badge-status="update-restart"] {
list-style-image: url("chrome://browser/skin/menu-badged.svg");
diff --git a/toolkit/mozapps/update/UpdateListener.jsm b/toolkit/mozapps/update/UpdateListener.jsm
index a2b228d321ac..8437f4b884d4 100644
--- a/toolkit/mozapps/update/UpdateListener.jsm
+++ b/toolkit/mozapps/update/UpdateListener.jsm
@@ -127,6 +127,15 @@ var UpdateListener = {
doc => this.replaceReleaseNotes(doc, update, "updateManualWhatsNew"));
},
+ showUpdateDownloadingNotification() {
+ this.showUpdateNotification("downloading", true, true, () => {
+ // The user clicked on the "Downloading update" app menu item.
+ // Code in browser/components/customizableui/content/panelUI.js
+ // receives the following notification and opens the about dialog.
+ Services.obs.notifyObservers(null, "show-update-progress", null);
+ });
+ },
+
handleUpdateError(update, status) {
switch (status) {
case "download-attempt-failed":
@@ -204,6 +213,17 @@ var UpdateListener = {
}
},
+ handleUpdateDownloading(status) {
+ switch (status) {
+ case "downloading":
+ this.showUpdateDownloadingNotification();
+ break;
+ case "idle":
+ this.reset();
+ break;
+ }
+ },
+
observe(subject, topic, status) {
if (!this.enabled) {
return;
@@ -215,6 +235,9 @@ var UpdateListener = {
case "update-available":
this.handleUpdateAvailable(update, status);
break;
+ case "update-downloading":
+ this.handleUpdateDownloading(status);
+ break;
case "update-staged":
case "update-downloaded":
this.handleUpdateStagedOrDownloaded(update, status);
diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js
index b2a4e82cf241..159112805425 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -38,6 +38,7 @@ const PREF_APP_UPDATE_ENABLED = "app.update.enabled";
const PREF_APP_UPDATE_IDLETIME = "app.update.idletime";
const PREF_APP_UPDATE_LOG = "app.update.log";
const PREF_APP_UPDATE_NOTIFIEDUNSUPPORTED = "app.update.notifiedUnsupported";
+const PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD = "app.update.notifyDuringDownload";
const PREF_APP_UPDATE_POSTUPDATE = "app.update.postupdate";
const PREF_APP_UPDATE_PROMPTWAITTIME = "app.update.promptWaitTime";
const PREF_APP_UPDATE_SERVICE_ENABLED = "app.update.service.enabled";
@@ -3325,6 +3326,8 @@ Downloader.prototype = {
if (this._request && this._request instanceof Ci.nsIRequest) {
this._request.cancel(cancelError);
}
+
+ this._notifyDownloadStatusObservers();
},
/**
@@ -3498,6 +3501,13 @@ Downloader.prototype = {
return selectedPatch;
},
+ _notifyDownloadStatusObservers: function Downloader_notifyDownloadStatusObservers() {
+ if (Services.prefs.getBoolPref(PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD, false)) {
+ let status = this.updateService.isDownloading ? "downloading" : "idle";
+ Services.obs.notifyObservers(this._update, "update-downloading", status);
+ }
+ },
+
/**
* Whether or not we are currently downloading something.
*/
@@ -3552,6 +3562,9 @@ Downloader.prototype = {
var um = Cc["@mozilla.org/updates/update-manager;1"].
getService(Ci.nsIUpdateManager);
um.saveUpdates();
+
+ this._notifyDownloadStatusObservers();
+
return STATE_DOWNLOADING;
},
@@ -3728,9 +3741,16 @@ Downloader.prototype = {
} else {
state = STATE_PENDING;
}
+#if defined(TOR_BROWSER_UPDATE)
+ // In Tor Browser, show update-related messages in the hamburger menu
+ // even if the update was started in the foreground, e.g., from the
+ // about box.
+ shouldShowPrompt = !getCanStageUpdates();
+#else
if (this.background) {
shouldShowPrompt = !getCanStageUpdates();
}
+#endif
AUSTLMY.pingDownloadCode(this.isCompleteUpdate, AUSTLMY.DWNLD_SUCCESS);
// Tell the updater.exe we're ready to apply.
@@ -3835,6 +3855,7 @@ Downloader.prototype = {
}
this._request = null;
+ this._notifyDownloadStatusObservers();
if (state == STATE_DOWNLOAD_FAILED) {
var allFailed = true;
@@ -3907,9 +3928,16 @@ Downloader.prototype = {
// processor service.
LOG("Downloader:onStopRequest - failed to stage update. Exception: " +
e);
+#if defined(TOR_BROWSER_UPDATE)
+ // In Tor Browser, show update-related messages in the hamburger menu
+ // even if the update was started in the foreground, e.g., from the
+ // about box.
+ shouldShowPrompt = true;
+#else
if (this.background) {
shouldShowPrompt = true;
}
+#endif
}
}
}
1
0

22 Feb '19
commit abcc56a2ebf32a4ceeea2554b5dea3ab1f6d2fd0
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Fri Feb 22 12:01:25 2019 +0100
Bug 29556: Fix nightly builds emails
By default dma will send emails by connecting to the configured mail
server on port 25.
According to https://riseup.net/en/email/clients we should be connecting
to mail.riseup.net on port 587.
---
tools/ansible/group_vars/boklm-tbb-nightly/dma.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml
index b210a3a..0148da5 100644
--- a/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml
+++ b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml
@@ -1,6 +1,7 @@
---
dma_conf: |
SMARTHOST mail.riseup.net
+ PORT 587
AUTHPATH /etc/dma/auth.conf
SECURETRANSFER
STARTTLS
1
0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_25849_v3'
by boklm@torproject.org 21 Feb '19
by boklm@torproject.org 21 Feb '19
21 Feb '19
commit d500c61974ff1cdbccd31a64181aa10cb1e9482f
Merge: caa9e6d 3de8afa
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Thu Feb 21 16:16:35 2019 +0100
Merge remote-tracking branch 'gk/bug_25849_v3'
projects/rust/build | 6 +-
projects/rust/config | 4 +-
projects/rust/unwind_128.patch | 161 +++++++++++++++++++++++++++++++++++++++++
projects/tor/build | 10 ++-
projects/tor/config | 3 +-
5 files changed, 178 insertions(+), 6 deletions(-)
1
0

[tor-browser-build/master] Bug 25849: Enable Rust in Tor for Windows nightlies
by boklm@torproject.org 21 Feb '19
by boklm@torproject.org 21 Feb '19
21 Feb '19
commit 3de8afa44fa4a7078f917263147f6e19107e3141
Author: Georg Koppen <gk(a)torproject.org>
Date: Sun Feb 10 20:30:19 2019 +0000
Bug 25849: Enable Rust in Tor for Windows nightlies
---
projects/rust/build | 6 +-
projects/rust/config | 4 +-
projects/rust/unwind_128.patch | 161 +++++++++++++++++++++++++++++++++++++++++
projects/tor/build | 10 ++-
projects/tor/config | 3 +-
5 files changed, 178 insertions(+), 6 deletions(-)
diff --git a/projects/rust/build b/projects/rust/build
index 12f012a..3c1d130 100644
--- a/projects/rust/build
+++ b/projects/rust/build
@@ -59,7 +59,11 @@ cd /var/tmp/build/rustc-[% c('version') %]-src
# See: https://github.com/rust-lang/rust/issues/12859 for discussion about
# that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to
# fix this problem. We apply the patch from neersighted.
- patch -p1 < $rootdir/unwind.patch
+ [% IF !c("input_file_var/unwind_128") %]
+ patch -p1 < $rootdir/unwind.patch
+ [% ELSE %]
+ patch -p1 < $rootdir/unwind_128.patch
+ [% END %]
[% END %]
[% IF c("var/android") %]
diff --git a/projects/rust/config b/projects/rust/config
index 99d1177..48912ab 100644
--- a/projects/rust/config
+++ b/projects/rust/config
@@ -89,7 +89,9 @@ input_files:
file_gpg_id: 1
gpg_keyring: rust.gpg
- filename: unwind.patch
- enable: '[% c("var/windows-i686") %]'
+ enable: '[% c("var/windows-i686") && !c("input_file_var/unwind_128") %]'
+ - filename: unwind_128.patch
+ enable: '[% c("input_file_var/unwind_128") %]'
- filename: 0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch
enable: '[% c("var/android") %]'
- filename: replace_pagesize_in_mmap.patch
diff --git a/projects/rust/unwind_128.patch b/projects/rust/unwind_128.patch
new file mode 100644
index 0000000..93528c9
--- /dev/null
+++ b/projects/rust/unwind_128.patch
@@ -0,0 +1,161 @@
+From 0a186eafebf26ca01879827a4cc95cc274791334 Mon Sep 17 00:00:00 2001
+From: Bjorn Neergaard <bjorn(a)neersighted.com>
+Date: Sat, 9 Feb 2019 19:39:23 +0000
+Subject: [PATCH] Fix cross-compiling i686-pc-windows-gnu from Linux
+
+This is still very rough and serves as a proof-of-concept for fixing
+Linux -> 32-bit MinGW cross compilation workflow. Currently, clang and
+GCC's MinGW targets both only support DW2 (DWARF) or SJLJ (Set Jump Long
+Jump) unwinding on 32-bit Windows.
+
+The default for GCC (and the way it is shipped on every major distro) is
+to use SJLJ on Windows, as DWARF cannot traverse non-DWARF frames. This
+would work fine, except for the fact that libgcc (our C runtime on the
+MinGW platform) exports symbols under a different name when configured
+to use SJLJ-style unwinding, and uses a preprocessor macro internally to
+alias them.
+
+Because of this, we have to detect this scenario and link to the correct
+symbols ourselves. Linking has been tested with a full bootstrap on both
+x86_64-unknown-linux-gnu and i686-pc-windows-gnu, as well as
+cross-compilation of some of my own projects.
+
+Obviously, the detection is a bit unrefined. Right now we
+unconditionally use SJLJ when compiling Linux -> MinGW. I'd like to add
+feature detection using compiler build flags or autotools-style
+compilation and object analysis. Input on the best way to proceed here
+is welcome.
+
+Also, currently there is copy-pasted/duplicated code in libunwind.
+Ideally, this could be reduced, but this would likely require a
+rethinking of how iOS is special-cased above, to avoid further
+duplication. Input on how to best structure this file is requested.
+
+diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
+index 11d9154ba6..bd8ff844f7 100644
+--- a/src/bootstrap/compile.rs
++++ b/src/bootstrap/compile.rs
+@@ -154,6 +154,11 @@ pub fn std_cargo(builder: &Builder,
+ } else {
+ let mut features = builder.std_features();
+
++ // FIXME: Temporary detection of SJLJ MinGW compilers.
++ if builder.config.build.contains("linux") && target == "i686-pc-windows-gnu" {
++ features.push_str(" sjlj_eh");
++ }
++
+ // When doing a local rebuild we tell cargo that we're stage1 rather than
+ // stage0. This works fine if the local rust and being-built rust have the
+ // same view of what the default allocator is, but fails otherwise. Since
+diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
+index 5a2dce5930..e1c876f503 100644
+--- a/src/libstd/Cargo.toml
++++ b/src/libstd/Cargo.toml
+@@ -50,3 +50,4 @@ force_alloc_system = []
+ panic-unwind = ["panic_unwind"]
+ profiler = ["profiler_builtins"]
+ wasm_syscall = []
++sjlj_eh = ["unwind/sjlj_eh"]
+diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml
+index 4760461df6..27c7303604 100644
+--- a/src/libunwind/Cargo.toml
++++ b/src/libunwind/Cargo.toml
+@@ -15,3 +15,6 @@ doc = false
+ core = { path = "../libcore" }
+ libc = { path = "../rustc/libc_shim" }
+ compiler_builtins = { path = "../rustc/compiler_builtins_shim" }
++
++[features]
++sjlj_eh = []
+diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs
+index 73a259bd44..ff3404864f 100644
+--- a/src/libunwind/libunwind.rs
++++ b/src/libunwind/libunwind.rs
+@@ -10,11 +10,6 @@
+
+ #![allow(bad_style)]
+
+-macro_rules! cfg_if {
+- ( $( if #[cfg( $meta:meta )] { $($it1:item)* } else { $($it2:item)* } )* ) =>
+- ( $( $( #[cfg($meta)] $it1)* $( #[cfg(not($meta))] $it2)* )* )
+-}
+-
+ use libc::{c_int, c_void, uintptr_t};
+
+ #[repr(C)]
+@@ -83,8 +78,8 @@ pub enum _Unwind_Context {}
+ pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reason_Code,
+ exception: *mut _Unwind_Exception);
+ extern "C" {
+- #[unwind(allowed)]
+- pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !;
++ #[cfg_attr(stage0, unwind)]
++ #[cfg_attr(not(stage0), unwind(allowed))]
+ pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception);
+ pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void;
+ pub fn _Unwind_GetRegionStart(ctx: *mut _Unwind_Context) -> _Unwind_Ptr;
+@@ -216,26 +211,52 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
+ pc
+ }
+ }
++} // cfg_if!
+
+-if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] {
+- // Not 32-bit iOS
++cfg_if! {
++if #[cfg(all(target_os = "ios", target_arch = "arm"))] {
++ // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace()
+ extern "C" {
+- #[unwind(allowed)]
+- pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code;
++ #[cfg_attr(stage0, unwind)]
++ #[cfg_attr(not(stage0), unwind(allowed))]
++ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !;
++ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code;
++ }
++
++ #[inline]
++ pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code {
++ _Unwind_SjLj_RaiseException(exc)
++ }
++
++} else if #[cfg(feature = "sjlj_eh")] {
++ extern "C" {
++ #[cfg_attr(stage0, unwind)]
++ #[cfg_attr(not(stage0), unwind(allowed))]
++ pub fn _Unwind_SjLj_Resume(e: *mut _Unwind_Exception) -> !;
++ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code;
+ pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn,
+ trace_argument: *mut c_void)
+ -> _Unwind_Reason_Code;
+ }
+-} else {
+- // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace()
+- extern "C" {
+- #[unwind(allowed)]
+- pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code;
++
++ #[inline]
++ pub unsafe fn _Unwind_Resume(exc: *mut _Unwind_Exception) -> ! {
++ _Unwind_SjLj_Resume(exc)
+ }
+
+ #[inline]
+ pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code {
+ _Unwind_SjLj_RaiseException(exc)
+ }
++} else {
++ extern "C" {
++ #[cfg_attr(stage0, unwind)]
++ #[cfg_attr(not(stage0), unwind(allowed))]
++ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !;
++ pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code;
++ pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn,
++ trace_argument: *mut c_void)
++ -> _Unwind_Reason_Code;
++ }
+ }
+ } // cfg_if!
+--
+2.20.1
+
diff --git a/projects/tor/build b/projects/tor/build
index e9bd326..f063693 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -24,7 +24,7 @@ mkdir -p /var/tmp/build
tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %]
-[% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %]
+[% IF !c("var/android") && c("var/nightly") %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]
export PATH=/var/tmp/dist/rust/bin:$PATH
[% END %]
@@ -33,6 +33,10 @@ libeventdir=/var/tmp/dist/libevent
openssldir=/var/tmp/dist/openssl
[% IF c("var/windows") %]
+ [% IF ("var/nightly") %]
+ # We are compiling Tor with Rust enabled for nightlies.
+ export TOR_RUST_TARGET=[% c("arch") %]-pc-windows-gnu
+ [% END %]
tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %]
zlibdir=/var/tmp/build/zlib
mingwlibs=/var/tmp/dist/mingw-w64/[% c("arch") %]-w64-mingw32/bin/
@@ -74,11 +78,11 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i
./autogen.sh
find -type f -print0 | xargs -0 [% c("var/touch") %]
-[% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \
+[% IF !c("var/android") && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \
[% IF c("var/asan") %]--enable-fragile-hardening[% END %] \
[% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \
[% IF c("var/osx") %]--enable-static-openssl[% END %] \
- [% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %]--enable-rust[% END %] \
+ [% IF !c("var/android") && c("var/nightly") %]--enable-rust[% END %] \
--prefix="$distdir" [% c("var/configure_opt") %]
[% IF c("var/osx") || c("var/windows") -%]
export LD_PRELOAD=[% c("var/faketime_path") %]
diff --git a/projects/tor/config b/projects/tor/config
index e6e923b..af90885 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -65,4 +65,5 @@ input_files:
input_file_var:
rust_version: 1.28.0
prev_version: 1.27.2
- enable: '[% (c("var/linux") || c("var/osx")) && c("var/nightly") %]'
+ unwind_128: '[% c("var/windows-i686") %]'
+ enable: '[% !c("var/android") && c("var/nightly") %]'
1
0

[tor-browser-build/master] Bug 23384: Add user pospeselr on build-sunet-a.torproject.net
by boklm@torproject.org 12 Feb '19
by boklm@torproject.org 12 Feb '19
12 Feb '19
commit caa9e6d5711ef098cfd7ba77fe88ad44e14cdd72
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Tue Feb 12 20:56:32 2019 +0100
Bug 23384: Add user pospeselr on build-sunet-a.torproject.net
---
tools/ansible/roles/tbb-team/defaults/main.yml | 1 +
tools/ansible/roles/tbb-team/files/pospeselr.pub | 1 +
2 files changed, 2 insertions(+)
diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml
index fa8ffa3..a1c091d 100644
--- a/tools/ansible/roles/tbb-team/defaults/main.yml
+++ b/tools/ansible/roles/tbb-team/defaults/main.yml
@@ -5,4 +5,5 @@ tbb_team_members:
- gk
- mcs
- mikeperry
+ - pospeselr
- sukhbir
diff --git a/tools/ansible/roles/tbb-team/files/pospeselr.pub b/tools/ansible/roles/tbb-team/files/pospeselr.pub
new file mode 100644
index 0000000..17274a4
--- /dev/null
+++ b/tools/ansible/roles/tbb-team/files/pospeselr.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDN8+GoMp+QiVpBXK8raB2u+3+BdqCL1CCTRzVu6jr+nqvwF2zFgH6qW6WTz85PEM1Lm66wY3SNwsNoCr3Kt53MQa1g6V9sGudi7kYUoV3u7LxLVMwNKK9K6YZZjDFCWBmhcvw/ntFccShgkv8zSCtcbHp1bLivImFi8MCTHJ/Uul/moi0vd3OPXYWGhPQDnLW7+q3o6DenffvjkdP/88QIJe63b/TesLLiC+Czeuu6sTNftCgBVmMwHyYrFPeIrQsiz2tYNgG9Iyd06ElozouGywFvT/s6zKnQUw7J5Mcv4MLXIj/6n75r/g/lVNT3cwho5RlBkGCC+xUH7+Us2QliuILp1EgaVsqB989j4EyTrYoUxfBhtXlmUXbaydO0cYG2tVwk7QRx6PTPO1xcR/UXo3VPio9/BHCZ1d2CPV0xCaXoCMp09fTSLCBM4o0NoxrFJAfbM1cWY3R+tmXPmF4venISGnYqYXLk4rx/HfWiUxSl0tDPB1f/VL786kthRgLhI02a55/31oSf53S2uzsZH0OvvwJyrYcF3jDmSHziMVn40A0HdjKtixfTuX4ZRynv3aZVlGpSuttm76+/nx3oiYSh7YqHXFfI4ZiGYoCkSXtfyC1QYVoMa6NS2B8I4cO9QXkOPxHvWwfBAtcpACZ7d5OQF5xjAY1mWiM7MmUUjw== richard(a)torproject.org
1
0

12 Feb '19
commit e66a25545ada2335a2e496b61f147547939b9ef7
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Feb 12 09:39:21 2019 +0000
There is no build2 of 60.5.1esr
---
projects/firefox-langpacks/config | 2 +-
rbm.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 17a707a..34d6fad 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
var:
ff_version: '[% pc("firefox", "var/firefox_version") %]'
- ff_build: build2
+ ff_build: build1
input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
targets:
diff --git a/rbm.conf b/rbm.conf
index 12d5130..03c105e 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
var:
torbrowser_version: '8.5a8'
- torbrowser_build: 'build1'
+ torbrowser_build: 'build2'
torbrowser_incremental_from:
- 8.5a7
project_name: tor-browser
1
0

12 Feb '19
commit fc5024a19cc315036eac989f0d1f34e84ec0c285
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Feb 12 08:56:09 2019 +0000
Release preparations for 8.5a8
Changelog update and versions bump
---
projects/firefox/config | 2 +-
projects/https-everywhere/config | 2 +-
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 +++++++++++++
rbm.conf | 6 +++---
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/projects/firefox/config b/projects/firefox/config
index 59ec1ee..68f2326 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -8,7 +8,7 @@ git_submodule: 1
gpg_keyring: torbutton.gpg
var:
- firefox_platform_version: 60.5.0
+ firefox_platform_version: 60.5.1
firefox_version: '[% c("var/firefox_platform_version") %]esr'
torbrowser_branch: 8.5
torbrowser_update_channel: alpha
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 1be120b..a9409cd 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 2019.1.7
+version: 2019.1.31
git_url: https://git.torproject.org/https-everywhere.git
git_hash: '[% c("version") %]'
git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 410173d..83d0f4b 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,16 @@
+Tor Browser 8.5a8 -- February 13 2019
+ * All platforms
+ * Update Firefox to 60.5.1esr
+ * Update HTTPS Everywhere to 2019.1.31
+ * Bug 29378: Remove 83.212.101.3 from default bridges
+ * Bug 29349: Remove network.http.spdy.* overrides from meek helper user.js
+ * Build System
+ * All Platforms
+ * Bug 29235: Build our own version of python3.6 for HTTPS Everywhere
+ * Bug 29167: Upgrade go to 1.11.5
+ * Linux
+ * Bug 29183: Use linux-x86_64 langpacks on linux-x86_64
+
Tor Browser 8.5a7 -- January 29 2019
* All Platforms
* Update Firefox to 60.5.0esr
diff --git a/rbm.conf b/rbm.conf
index 381eab6..12d5130 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '8.5a7'
- torbrowser_build: 'build4'
+ torbrowser_version: '8.5a8'
+ torbrowser_build: 'build1'
torbrowser_incremental_from:
- - 8.5a6
+ - 8.5a7
project_name: tor-browser
multi_lingual: 0
build_mar: 1
1
0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Bug 29180: MAR download stalls when about dialog is opened"
by gk@torproject.org 12 Feb '19
by gk@torproject.org 12 Feb '19
12 Feb '19
commit fcc53d9fa4969850b4cd77951974ee6db73e827b
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Feb 12 08:49:33 2019 +0000
Revert "Bug 29180: MAR download stalls when about dialog is opened"
This reverts commit 9ca60802516a3f693f6ae22e9df6994aab67c5f9.
We don't want to ship a new Torbutton but it contains language strings
we need.
---
browser/base/content/aboutDialog-appUpdater.js | 17 +++++-----------
toolkit/mozapps/update/content/updates.js | 27 ++++++++++++--------------
2 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js
index b732db6bee6b..e81098a1e898 100644
--- a/browser/base/content/aboutDialog-appUpdater.js
+++ b/browser/base/content/aboutDialog-appUpdater.js
@@ -318,18 +318,11 @@ appUpdater.prototype =
this.update.QueryInterface(Ci.nsIWritablePropertyBag);
this.update.setProperty("foregroundDownload", "true");
- // If one is not already in progress, start a download. Previously,
- // we would pause and restart an existing download in case there was
- // a need to transition from a background download to a foreground one,
- // but that caused Tor bug 29180. There is no difference between a
- // foreground and background download unless the update manifest
- // includes a backgroundInterval attribute.
- if (!this.isDownloading) {
- let state = this.aus.downloadUpdate(this.update, false);
- if (state == "failed") {
- this.selectPanel("downloadFailed");
- return;
- }
+ this.aus.pauseDownload();
+ let state = this.aus.downloadUpdate(this.update, false);
+ if (state == "failed") {
+ this.selectPanel("downloadFailed");
+ return;
}
this.setupDownloadingUI();
diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js
index 195265ff81f9..5b6ae7cc6ba1 100644
--- a/toolkit/mozapps/update/content/updates.js
+++ b/toolkit/mozapps/update/content/updates.js
@@ -751,22 +751,19 @@ var gDownloadingPage = {
gUpdates.update.QueryInterface(Ci.nsIWritablePropertyBag);
gUpdates.update.setProperty("foregroundDownload", "true");
- // If it is not already in progress, start the download. See
- // Tor bug 29180 as well as the longer comment in the startDownload()
- // function within browser/base/content/aboutDialog-appUpdater.js.
- if (!aus.isDownloading) {
- var state = aus.downloadUpdate(gUpdates.update, false);
- if (state == "failed") {
- // We've tried as hard as we could to download a valid update -
- // we fell back from a partial patch to a complete patch and even
- // then we couldn't validate. Show a validation error with
- // instructions on how to manually update.
- this.cleanUp();
- gUpdates.wiz.goTo("errors");
- return;
- }
+ // Pause any active background download and restart it as a foreground
+ // download.
+ aus.pauseDownload();
+ var state = aus.downloadUpdate(gUpdates.update, false);
+ if (state == "failed") {
+ // We've tried as hard as we could to download a valid update -
+ // we fell back from a partial patch to a complete patch and even
+ // then we couldn't validate. Show a validation error with instructions
+ // on how to manually update.
+ this.cleanUp();
+ gUpdates.wiz.goTo("errors");
+ return;
}
-
// Add this UI as a listener for active downloads
aus.addDownloadListener(this);
1
0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Bug 28885: notify users that update is downloading"
by gk@torproject.org 12 Feb '19
by gk@torproject.org 12 Feb '19
12 Feb '19
commit 58a439dd4e6fc1734d60d7175caa1cb2f88fbbac
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Feb 12 08:50:23 2019 +0000
Revert "Bug 28885: notify users that update is downloading"
This reverts commit 5f2b1d1a6be48be796f30dbef8ab3a3e42ae428f.
We don't want to ship a new Torbutton right now but it contains needed
language strings.
---
browser/app/profile/000-tor-browser.js | 1 -
.../customizableui/content/panelUI.inc.xul | 1 -
.../components/customizableui/content/panelUI.js | 28 ----------------------
browser/components/nsBrowserGlue.js | 1 -
.../themes/shared/customizableui/panelUI.inc.css | 1 -
browser/themes/shared/toolbarbutton-icons.inc.css | 1 -
toolkit/mozapps/update/UpdateListener.jsm | 23 ------------------
toolkit/mozapps/update/nsUpdateService.js | 28 ----------------------
8 files changed, 84 deletions(-)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 9f1e727ce724..11027f4c9a3a 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -20,7 +20,6 @@ pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags
// Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog
pref("app.update.promptWaitTime", 3600);
pref("app.update.badge", true);
-pref("app.update.notifyDuringDownload", true);
pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues
#ifdef XP_WIN
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index ee4f8351d02b..5891556a6e5f 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -172,7 +172,6 @@
<vbox id="appMenu-addon-banners"/>
<toolbarbutton class="panel-banner-item"
label-update-available="&updateAvailable.panelUI.label;"
- label-update-downloading="Downloading update"
label-update-manual="&updateManual.panelUI.label;"
label-update-restart="&updateRestart.panelUI.label2;"
oncommand="PanelUI._onBannerItemSelected(event)"
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index a4018bb2e6c2..5233be130be2 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -46,7 +46,6 @@ const PanelUI = {
init() {
this._initElements();
- this._initUpdaterStrings();
this.menuButton.addEventListener("mousedown", this);
this.menuButton.addEventListener("keypress", this);
@@ -54,7 +53,6 @@ const PanelUI = {
Services.obs.addObserver(this, "fullscreen-nav-toolbox");
Services.obs.addObserver(this, "appMenu-notifications");
- Services.obs.addObserver(this, "show-update-progress");
XPCOMUtils.defineLazyPreferenceGetter(this, "autoHideToolbarInFullScreen",
"browser.fullscreen.autohide", false, (pref, previousValue, newValue) => {
@@ -122,28 +120,6 @@ const PanelUI = {
}
},
- _initUpdaterStrings() {
- // If Torbutton is installed and enabled, replace the "Downloading update"
- // string with one from torbutton.properties (to facilitate localization).
- try {
- let brands = Services.strings.createBundle(
- "chrome://branding/locale/brand.properties");
- let stringArgs = [brands.GetStringFromName("brandShortName")];
- let torbuttonBundle = Services.strings.createBundle(
- "chrome://torbutton/locale/torbutton.properties");
- let label = torbuttonBundle.formatStringFromName(
- "updateDownloadingPanelUILabel", stringArgs, 1);
- let attrName = "label-update-downloading";
- let elements = document.getElementsByClassName("panel-banner-item");
- for (let i = 0; i < elements.length; ++i) {
- let elem = elements.item(i);
- if (elem.hasAttribute(attrName)) {
- elem.setAttribute(attrName, label);
- }
- }
- } catch (e) {}
- },
-
_eventListenersAdded: false,
_ensureEventListenersAdded() {
if (this._eventListenersAdded)
@@ -176,7 +152,6 @@ const PanelUI = {
Services.obs.removeObserver(this, "fullscreen-nav-toolbox");
Services.obs.removeObserver(this, "appMenu-notifications");
- Services.obs.removeObserver(this, "show-update-progress");
window.removeEventListener("MozDOMFullscreen:Entered", this);
window.removeEventListener("MozDOMFullscreen:Exited", this);
@@ -277,9 +252,6 @@ const PanelUI = {
this._notifications = AppMenuNotifications.notifications;
this._updateNotifications(true);
break;
- case "show-update-progress":
- openAboutDialog();
- break;
}
},
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index e68817fd3c7c..0ec10a3337d4 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -187,7 +187,6 @@ const global = this;
const listeners = {
observers: {
- "update-downloading": ["UpdateListener"],
"update-staged": ["UpdateListener"],
"update-downloaded": ["UpdateListener"],
"update-available": ["UpdateListener"],
diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css
index 4cb2032a09d1..75946aa5f082 100644
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -62,7 +62,6 @@
}
#PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
-#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
#PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
#PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center;
diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css
index 230ddf951858..d3a634d5ff51 100644
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -259,7 +259,6 @@ toolbar[brighttext] {
}
#PanelUI-menu-button[badge-status="update-available"],
-#PanelUI-menu-button[badge-status="update-downloading"],
#PanelUI-menu-button[badge-status="update-manual"],
#PanelUI-menu-button[badge-status="update-restart"] {
list-style-image: url("chrome://browser/skin/menu-badged.svg");
diff --git a/toolkit/mozapps/update/UpdateListener.jsm b/toolkit/mozapps/update/UpdateListener.jsm
index 8437f4b884d4..a2b228d321ac 100644
--- a/toolkit/mozapps/update/UpdateListener.jsm
+++ b/toolkit/mozapps/update/UpdateListener.jsm
@@ -127,15 +127,6 @@ var UpdateListener = {
doc => this.replaceReleaseNotes(doc, update, "updateManualWhatsNew"));
},
- showUpdateDownloadingNotification() {
- this.showUpdateNotification("downloading", true, true, () => {
- // The user clicked on the "Downloading update" app menu item.
- // Code in browser/components/customizableui/content/panelUI.js
- // receives the following notification and opens the about dialog.
- Services.obs.notifyObservers(null, "show-update-progress", null);
- });
- },
-
handleUpdateError(update, status) {
switch (status) {
case "download-attempt-failed":
@@ -213,17 +204,6 @@ var UpdateListener = {
}
},
- handleUpdateDownloading(status) {
- switch (status) {
- case "downloading":
- this.showUpdateDownloadingNotification();
- break;
- case "idle":
- this.reset();
- break;
- }
- },
-
observe(subject, topic, status) {
if (!this.enabled) {
return;
@@ -235,9 +215,6 @@ var UpdateListener = {
case "update-available":
this.handleUpdateAvailable(update, status);
break;
- case "update-downloading":
- this.handleUpdateDownloading(status);
- break;
case "update-staged":
case "update-downloaded":
this.handleUpdateStagedOrDownloaded(update, status);
diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js
index 159112805425..b2a4e82cf241 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -38,7 +38,6 @@ const PREF_APP_UPDATE_ENABLED = "app.update.enabled";
const PREF_APP_UPDATE_IDLETIME = "app.update.idletime";
const PREF_APP_UPDATE_LOG = "app.update.log";
const PREF_APP_UPDATE_NOTIFIEDUNSUPPORTED = "app.update.notifiedUnsupported";
-const PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD = "app.update.notifyDuringDownload";
const PREF_APP_UPDATE_POSTUPDATE = "app.update.postupdate";
const PREF_APP_UPDATE_PROMPTWAITTIME = "app.update.promptWaitTime";
const PREF_APP_UPDATE_SERVICE_ENABLED = "app.update.service.enabled";
@@ -3326,8 +3325,6 @@ Downloader.prototype = {
if (this._request && this._request instanceof Ci.nsIRequest) {
this._request.cancel(cancelError);
}
-
- this._notifyDownloadStatusObservers();
},
/**
@@ -3501,13 +3498,6 @@ Downloader.prototype = {
return selectedPatch;
},
- _notifyDownloadStatusObservers: function Downloader_notifyDownloadStatusObservers() {
- if (Services.prefs.getBoolPref(PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD, false)) {
- let status = this.updateService.isDownloading ? "downloading" : "idle";
- Services.obs.notifyObservers(this._update, "update-downloading", status);
- }
- },
-
/**
* Whether or not we are currently downloading something.
*/
@@ -3562,9 +3552,6 @@ Downloader.prototype = {
var um = Cc["@mozilla.org/updates/update-manager;1"].
getService(Ci.nsIUpdateManager);
um.saveUpdates();
-
- this._notifyDownloadStatusObservers();
-
return STATE_DOWNLOADING;
},
@@ -3741,16 +3728,9 @@ Downloader.prototype = {
} else {
state = STATE_PENDING;
}
-#if defined(TOR_BROWSER_UPDATE)
- // In Tor Browser, show update-related messages in the hamburger menu
- // even if the update was started in the foreground, e.g., from the
- // about box.
- shouldShowPrompt = !getCanStageUpdates();
-#else
if (this.background) {
shouldShowPrompt = !getCanStageUpdates();
}
-#endif
AUSTLMY.pingDownloadCode(this.isCompleteUpdate, AUSTLMY.DWNLD_SUCCESS);
// Tell the updater.exe we're ready to apply.
@@ -3855,7 +3835,6 @@ Downloader.prototype = {
}
this._request = null;
- this._notifyDownloadStatusObservers();
if (state == STATE_DOWNLOAD_FAILED) {
var allFailed = true;
@@ -3928,16 +3907,9 @@ Downloader.prototype = {
// processor service.
LOG("Downloader:onStopRequest - failed to stage update. Exception: " +
e);
-#if defined(TOR_BROWSER_UPDATE)
- // In Tor Browser, show update-related messages in the hamburger menu
- // even if the update was started in the foreground, e.g., from the
- // about box.
- shouldShowPrompt = true;
-#else
if (this.background) {
shouldShowPrompt = true;
}
-#endif
}
}
}
1
0

11 Feb '19
commit 36edb804ea966828f8cebd9c9dedb947b6bbf5d1
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Feb 11 22:24:02 2019 +0000
Release preparations for 8.0.6
---
projects/firefox/config | 2 +-
projects/https-everywhere/config | 2 +-
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++
rbm.conf | 6 +++---
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/projects/firefox/config b/projects/firefox/config
index 238bc5c..c6d2a6a 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git
gpg_keyring: torbutton.gpg
var:
- firefox_platform_version: 60.5.0
+ firefox_platform_version: 60.5.1
firefox_version: '[% c("var/firefox_platform_version") %]esr'
torbrowser_branch: 8.0
torbrowser_update_channel: alpha
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 1be120b..a9409cd 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 2019.1.7
+version: 2019.1.31
git_url: https://git.torproject.org/https-everywhere.git
git_hash: '[% c("version") %]'
git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index cc51f85..e1dbaa3 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,12 @@
+Tor Browser 8.0.6 -- February 12 2019
+ * All platforms
+ * Update Firefox to 60.5.1esr
+ * Update HTTPS Everywhere to 2019.1.31
+ * Bug 29378: Remove 83.212.101.3 from default bridges
+ * Build System
+ * All Platforms
+ * Bug 29235: Build our own version of python3.6 for HTTPS Everywhere
+
Tor Browser 8.0.5 -- January 29 2019
* All platforms
* Update Firefox to 60.5.0esr
diff --git a/rbm.conf b/rbm.conf
index 7abdf6a..2983684 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '8.0.5'
- torbrowser_build: 'build2'
+ torbrowser_version: '8.0.6'
+ torbrowser_build: 'build1'
torbrowser_incremental_from:
- - 8.0.4
+ - 8.0.5
project_name: tor-browser
multi_lingual: 0
build_mar: 1
1
0

[tor-browser-build/maint-8.0] Bug 29158: Install updated apt packages (CVE-2019-3462)
by gk@torproject.org 11 Feb '19
by gk@torproject.org 11 Feb '19
11 Feb '19
commit 528f683266709865780e75b14755715f44f04d5a
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Wed Jan 23 14:01:38 2019 +0100
Bug 29158: Install updated apt packages (CVE-2019-3462)
---
projects/debootstrap-image/config | 78 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 77 insertions(+), 1 deletion(-)
diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config
index 10e2afe..fa9587a 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -13,34 +13,95 @@ var:
pre: |
#!/bin/sh
set -e
+ # Bug 29158: install fixed packages for apt vulnerability (CVE-2019-3462)
+ dpkg -i ./apt_1.2.29ubuntu0.1_amd64.deb ./libapt-pkg5.0_1.2.29ubuntu0.1_amd64.deb
apt-get update -y
apt-get install -y debian-archive-keyring ubuntu-keyring debootstrap
debootstrap --arch=[% c("var/container/arch") %] [% c("var/container/debootstrap_opt") %] [% c("var/container/suite") %] base-image [% c("var/container/debootstrap_mirror") %]
+ [% IF c("var/apt_package_filename") || c("var/apt_utils_package_filename") || c("var/libapt_inst_package_filename") || c("var/libapt_pkg_package_filename") -%]
+ mkdir ./base-image/apt-update
+ mv [% c("var/apt_package_filename") %] [% c("var/apt_utils_package_filename") %] \
+ [% c("var/libapt_inst_package_filename") %] [% c("var/libapt_pkg_package_filename") %] \
+ ./base-image/apt-update
+ mount proc ./base-image/proc -t proc
+ mount sysfs ./base-image/sys -t sysfs
+ chroot ./base-image dpkg -i -R /apt-update
+ umount ./base-image/proc
+ umount ./base-image/sys
+ [% END -%]
+ [% IF c("var/minimal_apt_version") -%]
+ apt_version=$(dpkg --admindir=$(pwd)/base-image/var/lib/dpkg -s apt | grep '^Version: ' | cut -d ' ' -f 2)
+ echo "apt version: $apt_version"
+ dpkg --compare-versions "$apt_version" ge '[% c("var/minimal_apt_version") %]'
+ [% END -%]
tar -C ./base-image -czf [% dest_dir %]/[% c("filename") %] .
targets:
wheezy-amd64:
var:
+ minimal_apt_version: '0.9.7.9+deb7u8'
+ # https://deb.freexian.com/extended-lts/updates/ela-76-1-apt/
+ apt_packages_baseurl: http://deb.freexian.com/extended-lts/pool/main/a/apt
+ apt_package_filename: apt_0.9.7.9+deb7u8_amd64.deb
+ apt_package_sha256sum: 83dcdb3f9c11df28b30b85bbb9dec341effbf36ee881a04dece3390082080761
+ apt_utils_package_filename: apt-utils_0.9.7.9+deb7u8_amd64.deb
+ apt_utils_package_sha256sum: 91a4d0ec92a32f13e3acb37f71546d48c51a0df25f3b9eb6a96b73dfc93a11ed
+ libapt_inst_package_filename: libapt-inst1.5_0.9.7.9+deb7u8_amd64.deb
+ libapt_inst_package_sha256sum: 181c9c21e1b33496b251fc76ba8ed04acbb8e23006909d27795bbc287eddd027
+ libapt_pkg_package_filename: libapt-pkg4.12_0.9.7.9+deb7u8_amd64.deb
+ libapt_pkg_package_sha256sum: b360dfb5a65ac2f7b81a2551d8a520ba2265785537d6d669869a159888b81999
+
container:
suite: wheezy
arch: amd64
+
wheezy-i386:
var:
+ # Missing apt packages for i386:
+ # http://deb.freexian.com/extended-lts/pool/main/a/apt/
container:
suite: wheezy
arch: i386
+
jessie-amd64:
var:
+ minimal_apt_version: 1.0.9.8.5
+ # https://lists.debian.org/debian-lts-announce/2019/01/msg00014.html
+ apt_packages_baseurl: http://security.debian.org/debian-security/pool/updates/main/a/apt
+ apt_package_filename: apt_1.0.9.8.5_amd64.deb
+ apt_package_sha256sum: 4078748632abc19836d045f80f9d6933326065ca1d47367909a0cf7f29e7dfe8
+ apt_utils_package_filename: apt-utils_1.0.9.8.5_amd64.deb
+ apt_utils_package_sha256sum: 87c55d9ccadcabd59674873c221357c774020c116afd978fb9df6d2d0303abf2
+ libapt_inst_package_filename: libapt-inst1.5_1.0.9.8.5_amd64.deb
+ libapt_inst_package_sha256sum: f9615532b1577b3d1455fa51839ce91765f2860eb3a6810fb5e0de0c87253030
+ libapt_pkg_package_filename: libapt-pkg4.12_1.0.9.8.5_amd64.deb
+ libapt_pkg_package_sha256sum: 295d9c69854a4cfbcb46001b09b853f5a098a04c986fc5ae01a0124c1c27e6bd
+
container:
suite: jessie
arch: amd64
+
jessie-i386:
var:
+ minimal_apt_version: 1.0.9.8.5
+ # https://lists.debian.org/debian-lts-announce/2019/01/msg00014.html
+ apt_packages_baseurl: http://security.debian.org/debian-security/pool/updates/main/a/apt
+ apt_package_filename: apt_1.0.9.8.5_i386.deb
+ apt_package_sha256sum: 13c230e9c544b1e67a8da413046bf1728526372170533b1a23e70cc99c40a228
+ apt_utils_package_filename: apt-utils_1.0.9.8.5_i386.deb
+ apt_utils_package_sha256sum: 1a74b12c8bb6b3968a721f3aa96739073e4fe2ced9302792c533e21535bc9cf4
+ libapt_inst_package_filename: libapt-inst1.5_1.0.9.8.5_i386.deb
+ libapt_inst_package_sha256sum: 5791661dd4ade72b61086fefdc209bd1f76ac7b7c812d6d4ba951b1a6232f0b9
+ libapt_pkg_package_filename: libapt-pkg4.12_1.0.9.8.5_i386.deb
+ libapt_pkg_package_sha256sum: 201b6cf4625ed175e6a024ac1f7ca6c526ca79d859753c125b02cd69e26c349d
+
container:
suite: jessie
arch: i386
+
buster-amd64:
var:
+ minimal_apt_version: '1.8.0~alpha3.1'
container:
suite: buster
arch: amd64
@@ -49,4 +110,19 @@ input_files:
- URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'
filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'
sha256sum: 353b01ac60c43574c4977b1a9b7fe09a43298cb572de1a2090a8f09c5133b4d2
-
+ - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/apt_1.2.29ubuntu0.1_amd64…
+ sha256sum: e3f930803b564c5ecc17281acf491940d87634a1a067072fb8c92c712ee45930
+ - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/libapt-pkg5.0_1.2.29ubunt…
+ sha256sum: 93b465b4b320a4fa0c36a85da3851ba8cda61935f29954ca55c011ab498c4cf9
+ - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/apt_package_filename") %]'
+ sha256sum: '[% c("var/apt_package_sha256sum") %]'
+ enable: '[% c("var/apt_package_filename") %]'
+ - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/apt_utils_package_filename") %]'
+ sha256sum: '[% c("var/apt_utils_package_sha256sum") %]'
+ enable: '[% c("var/apt_utils_package_filename") %]'
+ - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/libapt_inst_package_filename") %]'
+ sha256sum: '[% c("var/libapt_inst_package_sha256sum") %]'
+ enable: '[% c("var/libapt_inst_package_filename") %]'
+ - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/libapt_pkg_package_filename") %]'
+ sha256sum: '[% c("var/libapt_pkg_package_sha256sum") %]'
+ enable: '[% c("var/libapt_pkg_package_filename") %]'
1
0

[tor-browser-build/maint-8.0] Bug 29235: Build our own version of python3.6
by gk@torproject.org 11 Feb '19
by gk@torproject.org 11 Feb '19
11 Feb '19
commit d036a293dcd041d3ed4d02453b85aa03cfed23fa
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Wed Jan 30 20:54:51 2019 +0100
Bug 29235: Build our own version of python3.6
The build of HTTPS-Everywhere requires python3.6, however the python3.6
package which we were using has now been removed from Debian Unstable.
We now build python 3.6 ourselves. As the different platforms use a
different suite by default, we add the common-stretch target to
rbm.conf, which we use to avoid building a different python for each
platform.
---
keyring/python.gpg | Bin 0 -> 4302 bytes
projects/debootstrap-image/config | 6 +++---
projects/https-everywhere/build | 1 +
projects/https-everywhere/config | 9 ++++++---
projects/python/build | 14 ++++++++++++++
projects/python/config | 25 +++++++++++++++++++++++++
rbm.conf | 17 +++++++++++++++++
7 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/keyring/python.gpg b/keyring/python.gpg
new file mode 100644
index 0000000..66711fd
Binary files /dev/null and b/keyring/python.gpg differ
diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config
index 3c2df77..912d4e6 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -100,11 +100,11 @@ targets:
suite: jessie
arch: i386
- buster-amd64:
+ stretch-amd64:
var:
- minimal_apt_version: '1.8.0~alpha3.1'
+ minimal_apt_version: 1.4.9
container:
- suite: buster
+ suite: stretch
arch: amd64
input_files:
diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build
index 10dd4bf..88431e0 100644
--- a/projects/https-everywhere/build
+++ b/projects/https-everywhere/build
@@ -1,5 +1,6 @@
#!/bin/bash
[% c("var/set_default_env") -%]
+[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %]
tar xf [% project %]-[% c('version') %].tar.gz
cd [% project %]-[% c('version') %]
./make.sh
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 59eb463..1be120b 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -10,18 +10,17 @@ var:
# HTTPS Everywhere is expected to be the same on all platforms. To avoid
# building the same thing 4 times, using 4 different container images
# (each one with a different suite or architecture), we set the container
- # to buster/amd64 for all platforms. This allows us to create only one
+ # to stretch/amd64 for all platforms. This allows us to create only one
# container image, and also build the extension only one time as the
# filename does not contain the platform, and var/build_id should be
# the same since there is now nothing platform specific in the build
# inputs. This allows us to save a little time and disk space.
container:
use_container: 1
- suite: buster
+ suite: stretch
arch: amd64
deps:
- git
- - python3.6
- libxslt1.1
- libxml2-utils
- sqlite3
@@ -31,3 +30,7 @@ var:
input_files:
- project: container-image
+ - project: python
+ name: python
+ target:
+ - common-stretch
diff --git a/projects/python/build b/projects/python/build
new file mode 100644
index 0000000..1fff7ce
--- /dev/null
+++ b/projects/python/build
@@ -0,0 +1,14 @@
+#!/bin/bash
+[% c("var/set_default_env") -%]
+distdir=/var/tmp/dist/[% project %]
+mkdir -p $distdir
+tar xf [% c('input_files_by_name/python') %]
+cd Python-[% c('version') %]
+./configure --prefix=$distdir
+make -j[% c("buildconf/num_procs") %]
+make prefix=$distdir install
+cd /var/tmp/dist
+[% c('tar', {
+ tar_src => 'python',
+ tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
+ }) %]
diff --git a/projects/python/config b/projects/python/config
new file mode 100644
index 0000000..10c79cc
--- /dev/null
+++ b/projects/python/config
@@ -0,0 +1,25 @@
+# vim: filetype=yaml sw=2
+version: 3.6.8
+filename: 'python-[% c("lsb_release/id") %]-[% c("lsb_release/release") %]-[% c("var/build_id") %].tar.gz'
+var:
+ container:
+ use_container: 1
+ deps:
+ - xz-utils
+ - build-essential
+ - python-all
+ - zlib1g-dev
+ - libssl-dev
+
+ setup: |
+ mkdir -p /var/tmp/dist
+ tar -C /var/tmp/dist -xf $rootdir/[% c("python_tarfile") %]
+ export PATH=/var/tmp/dist/python/bin:"$PATH"
+
+input_files:
+ - project: container-image
+ - name: python
+ URL: 'https://www.python.org/ftp/python/[% c("version") %]/Python-[% c("version") %].tar.xz'
+ gpg_keyring: python.gpg
+ sig_ext: asc
+ file_gpg_id: 1
diff --git a/rbm.conf b/rbm.conf
index 5e1ec0e..7abdf6a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -137,6 +137,23 @@ targets:
# Don't create mar files to save time
build_mar: 0
+ # The common-stretch target is used to build components that are common to all
+ # platforms, using Debian stretch.
+ common-stretch:
+ var:
+ common: 1
+ container:
+ suite: stretch
+ arch: amd64
+ deps:
+ - build-essential
+ - python
+ - bison
+ - automake
+ - libtool
+ - zip
+ - unzip
+
torbrowser-linux-x86_64:
- linux-x86_64
- linux
1
0

[tor-browser-build/maint-8.0] Bug 29181: Add a version number in debootstrap-image filename
by gk@torproject.org 11 Feb '19
by gk@torproject.org 11 Feb '19
11 Feb '19
commit 1224c208e61b18dfd078f98e88bc1666800cf5bb
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Fri Jan 25 17:37:43 2019 +0100
Bug 29181: Add a version number in debootstrap-image filename
Updating this version number will cause the old images created by
debootstrap-image to be discarded when a new image is built by
container-image. However existing images from container-image will not
be discarded as container-image's filename doesn't depend on
debootstrap-image's filename.
---
projects/debootstrap-image/config | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config
index fa9587a..3c2df77 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -1,5 +1,6 @@
# vim: filetype=yaml sw=2
-filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/arch") %].tar.gz'
+filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/arch") %]-[% c("version") %].tar.gz'
+version: 1
pkg_type: build
var:
1
0

[tor-browser-build/master] Bug 29453: Add Buster again for Android
by boklm@torproject.org 11 Feb '19
by boklm@torproject.org 11 Feb '19
11 Feb '19
commit af5f73dc3dc34144736d5f4dfb3134db4f8f652c
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Feb 11 06:56:48 2019 +0000
Bug 29453: Add Buster again for Android
---
projects/debootstrap-image/config | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config
index 7e8b280..ba34032 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -100,6 +100,14 @@ targets:
suite: jessie
arch: i386
+ # Still needed to fix faketime issues in tor-browser for Android, see: #29453
+ buster-amd64:
+ var:
+ minimal_apt_version: '1.8.0~alpha3.1'
+ container:
+ suite: buster
+ arch: amd64
+
stretch-amd64:
var:
minimal_apt_version: 1.4.9
1
0
commit fb741a9759ed5858d52c1d7392ce49c1082eace1
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Feb 8 09:37:51 2019 +0000
Fold in stable CHANGELOG
---
src/CHANGELOG | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/CHANGELOG b/src/CHANGELOG
index d8f3e488..74ac0cd0 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -6,6 +6,10 @@
* Translations update
* Code clean-up
+2.0.10
+ * Bug 29035: Clean up our donation campaign and add newsletter sign-up link
+ * Bug 27175: Add pref to allow users to persist custom noscript settings
+
2.1.3
* Bug 28540: Use new text for 2018 donation banner
* Bug 27290: Remove WebGL pref for min capability mode
1
0
commit 1adf9a9e405de64ffbeec1cc83984b556f9266c3
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Feb 8 09:35:44 2019 +0000
Fold in stable changelog
---
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 5a9feb7..410173d 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -50,6 +50,21 @@ Tor Browser 8.5a7 -- January 29 2019
* Android
* Bug 28752: Don't download tor-android-binary resources during build
+Tor Browser 8.0.5 -- January 29 2019
+ * All platforms
+ * Update Firefox to 60.5.0esr
+ * Update Tor to 0.3.5.7
+ * Update Torbutton to 2.0.10
+ * Bug 29035: Clean up our donation campaign and add newsletter sign-up link
+ * Bug 27175: Add pref to allow users to persist custom noscript settings
+ * Update HTTPS Everywhere to 2019.1.7
+ * Update NoScript to 10.2.1
+ * Bug 28873: Cascading of permissions is broken
+ * Bug 28720: Some videos are blocked outright on higher security levels
+ * Bug 26540: Enabling pdfjs disableRange option prevents pdfs from loading
+ * Bug 28740: Adapt Windows navigator.platform value on 64-bit systems
+ * Bug 28695: Set default security.pki.name_matching_mode to enforce (3)
+
Tor Browser 8.5a6 -- December 11 2018
* All Platforms
* Update Firefox to 60.4.0esr
1
0

[tor-browser-build/maint-8.0] Bug 29378: Remove 83.212.101.3 from default bridges
by gk@torproject.org 07 Feb '19
by gk@torproject.org 07 Feb '19
07 Feb '19
commit a81dc9fe7c3e1a1eb520ea8e50d481adb4d396c3
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Thu Feb 7 12:33:13 2019 +0100
Bug 29378: Remove 83.212.101.3 from default bridges
---
.../Bundle-Data/PTConfigs/bridge_prefs.js | 58 +++++++++++-----------
1 file changed, 28 insertions(+), 30 deletions(-)
diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
index f58eb02..8da9588 100644
--- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -2,11 +2,10 @@
pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4");
// Default bridges.
-pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239");
-pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9");
-pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9");
-pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED");
-pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A");
+pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9");
+pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9");
+pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED");
+pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A");
pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42");
pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
@@ -15,31 +14,30 @@ pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A1
pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");
pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 83.212.101.3:50002 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2");
-pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1");
-/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.21"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.22", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.28", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2");
+pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1");
+/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.20"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.22", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0");
pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");
1
0

[tor-browser-build/master] Bug 29378: Remove 83.212.101.3 from default bridges
by gk@torproject.org 07 Feb '19
by gk@torproject.org 07 Feb '19
07 Feb '19
commit bd7eff5c7a3a6fac22270a4183b75e3615cfb127
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Thu Feb 7 12:33:13 2019 +0100
Bug 29378: Remove 83.212.101.3 from default bridges
---
.../Bundle-Data/PTConfigs/bridge_prefs.js | 58 +++++++++++-----------
1 file changed, 28 insertions(+), 30 deletions(-)
diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
index f58eb02..8da9588 100644
--- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -2,11 +2,10 @@
pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4");
// Default bridges.
-pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239");
-pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9");
-pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9");
-pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED");
-pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A");
+pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9");
+pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9");
+pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED");
+pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A");
pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42");
pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
@@ -15,31 +14,30 @@ pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A1
pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");
pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 83.212.101.3:50002 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2");
-pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1");
-/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.21"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.22", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.28", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2");
+pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1");
+/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.20"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.22", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0");
pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");
1
0

[tor-launcher/master] Bug 29328: Account for Tor 0.4.0.x's revised bootstrap status reporting
by gk@torproject.org 07 Feb '19
by gk@torproject.org 07 Feb '19
07 Feb '19
commit a40e5e1b0fec841dfb310ed6f66be778c296f9b2
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Tue Feb 5 11:49:51 2019 -0500
Bug 29328: Account for Tor 0.4.0.x's revised bootstrap status reporting
Starting with the 0.4.0.x series, Tor reports bootstrap progress
more accurately and with more detail. Add localized strings for the
new tags that are used and, for compatibility with older versions
of Tor, map obsolete tags to new tags.
---
src/chrome/locale/ach/torlauncher.properties | 5 +----
src/chrome/locale/ady/torlauncher.properties | 5 +----
src/chrome/locale/af-ZA/torlauncher.properties | 5 +----
src/chrome/locale/af/torlauncher.properties | 5 +----
src/chrome/locale/ak/torlauncher.properties | 5 +----
src/chrome/locale/am-ET/torlauncher.properties | 5 +----
src/chrome/locale/am/torlauncher.properties | 5 +----
src/chrome/locale/ar/torlauncher.properties | 5 +----
src/chrome/locale/arn/torlauncher.properties | 5 +----
src/chrome/locale/ast/torlauncher.properties | 5 +----
src/chrome/locale/az/torlauncher.properties | 5 +----
src/chrome/locale/be/torlauncher.properties | 5 +----
src/chrome/locale/bg-BG/torlauncher.properties | 5 +----
src/chrome/locale/bg/torlauncher.properties | 5 +----
src/chrome/locale/bn-BD/torlauncher.properties | 5 +----
src/chrome/locale/bn-IN/torlauncher.properties | 5 +----
src/chrome/locale/bn/torlauncher.properties | 5 +----
src/chrome/locale/bo/torlauncher.properties | 5 +----
src/chrome/locale/br/torlauncher.properties | 5 +----
src/chrome/locale/bs/torlauncher.properties | 5 +----
src/chrome/locale/ca-ES/torlauncher.properties | 5 +----
src/chrome/locale/ca/torlauncher.properties | 5 +----
src/chrome/locale/cs-CZ/torlauncher.properties | 5 +----
src/chrome/locale/cs/torlauncher.properties | 5 +----
src/chrome/locale/csb/torlauncher.properties | 5 +----
src/chrome/locale/cv/torlauncher.properties | 5 +----
src/chrome/locale/cy/torlauncher.properties | 5 +----
src/chrome/locale/da/torlauncher.properties | 5 +----
src/chrome/locale/de/torlauncher.properties | 5 +----
src/chrome/locale/dz/torlauncher.properties | 5 +----
src/chrome/locale/el-GR/torlauncher.properties | 5 +----
src/chrome/locale/el/torlauncher.properties | 5 +----
src/chrome/locale/en-GB/torlauncher.properties | 5 +----
src/chrome/locale/en/torlauncher.properties | 24 ++++++++++++++++++----
src/chrome/locale/eo/torlauncher.properties | 5 +----
src/chrome/locale/es-AR/torlauncher.properties | 5 +----
src/chrome/locale/es-CL/torlauncher.properties | 5 +----
src/chrome/locale/es-CO/torlauncher.properties | 5 +----
src/chrome/locale/es-MX/torlauncher.properties | 5 +----
src/chrome/locale/es-NI/torlauncher.properties | 5 +----
src/chrome/locale/es/torlauncher.properties | 5 +----
src/chrome/locale/et/torlauncher.properties | 5 +----
src/chrome/locale/eu/torlauncher.properties | 5 +----
src/chrome/locale/fa/torlauncher.properties | 5 +----
src/chrome/locale/fi/torlauncher.properties | 5 +----
src/chrome/locale/fil/torlauncher.properties | 5 +----
src/chrome/locale/fo/torlauncher.properties | 5 +----
src/chrome/locale/fr-CA/torlauncher.properties | 5 +----
src/chrome/locale/fr/torlauncher.properties | 5 +----
src/chrome/locale/fur/torlauncher.properties | 5 +----
src/chrome/locale/fy/torlauncher.properties | 5 +----
src/chrome/locale/ga/torlauncher.properties | 5 +----
src/chrome/locale/gl/torlauncher.properties | 5 +----
src/chrome/locale/gu-IN/torlauncher.properties | 5 +----
src/chrome/locale/gu/torlauncher.properties | 5 +----
src/chrome/locale/gun/torlauncher.properties | 5 +----
src/chrome/locale/ha/torlauncher.properties | 5 +----
src/chrome/locale/he/torlauncher.properties | 5 +----
src/chrome/locale/hi/torlauncher.properties | 5 +----
src/chrome/locale/hr-HR/torlauncher.properties | 5 +----
src/chrome/locale/hr/torlauncher.properties | 5 +----
src/chrome/locale/ht/torlauncher.properties | 5 +----
src/chrome/locale/hu/torlauncher.properties | 5 +----
src/chrome/locale/hy-AM/torlauncher.properties | 5 +----
src/chrome/locale/hy/torlauncher.properties | 5 +----
src/chrome/locale/ia/torlauncher.properties | 5 +----
src/chrome/locale/id/torlauncher.properties | 5 +----
src/chrome/locale/is/torlauncher.properties | 5 +----
src/chrome/locale/it/torlauncher.properties | 5 +----
src/chrome/locale/ja/torlauncher.properties | 5 +----
src/chrome/locale/jv/torlauncher.properties | 5 +----
src/chrome/locale/ka/torlauncher.properties | 5 +----
src/chrome/locale/kk/torlauncher.properties | 5 +----
src/chrome/locale/km/torlauncher.properties | 5 +----
src/chrome/locale/kn/torlauncher.properties | 5 +----
src/chrome/locale/ko-KR/torlauncher.properties | 5 +----
src/chrome/locale/ko/torlauncher.properties | 5 +----
src/chrome/locale/ku/torlauncher.properties | 5 +----
src/chrome/locale/kw/torlauncher.properties | 5 +----
src/chrome/locale/ky/torlauncher.properties | 5 +----
src/chrome/locale/lb/torlauncher.properties | 5 +----
src/chrome/locale/lg/torlauncher.properties | 5 +----
src/chrome/locale/ln/torlauncher.properties | 5 +----
src/chrome/locale/lo/torlauncher.properties | 5 +----
src/chrome/locale/lt/torlauncher.properties | 5 +----
src/chrome/locale/lv/torlauncher.properties | 5 +----
src/chrome/locale/mg/torlauncher.properties | 5 +----
src/chrome/locale/mi/torlauncher.properties | 5 +----
src/chrome/locale/mk/torlauncher.properties | 5 +----
src/chrome/locale/ml/torlauncher.properties | 5 +----
src/chrome/locale/mn/torlauncher.properties | 5 +----
src/chrome/locale/mr/torlauncher.properties | 5 +----
src/chrome/locale/ms-MY/torlauncher.properties | 5 +----
src/chrome/locale/mt/torlauncher.properties | 5 +----
src/chrome/locale/my/torlauncher.properties | 5 +----
src/chrome/locale/nah/torlauncher.properties | 5 +----
src/chrome/locale/nap/torlauncher.properties | 5 +----
src/chrome/locale/nb/torlauncher.properties | 5 +----
src/chrome/locale/nds/torlauncher.properties | 5 +----
src/chrome/locale/ne/torlauncher.properties | 5 +----
src/chrome/locale/nl-BE/torlauncher.properties | 5 +----
src/chrome/locale/nl/torlauncher.properties | 5 +----
src/chrome/locale/nn/torlauncher.properties | 5 +----
src/chrome/locale/nso/torlauncher.properties | 5 +----
src/chrome/locale/oc/torlauncher.properties | 5 +----
src/chrome/locale/or/torlauncher.properties | 5 +----
src/chrome/locale/pa/torlauncher.properties | 5 +----
src/chrome/locale/pap/torlauncher.properties | 5 +----
src/chrome/locale/pl/torlauncher.properties | 5 +----
src/chrome/locale/pms/torlauncher.properties | 5 +----
src/chrome/locale/ps/torlauncher.properties | 5 +----
src/chrome/locale/pt-BR/torlauncher.properties | 5 +----
src/chrome/locale/pt/torlauncher.properties | 5 +----
src/chrome/locale/ro/torlauncher.properties | 5 +----
src/chrome/locale/ru/torlauncher.properties | 5 +----
.../locale/ru(a)petr1708/torlauncher.properties | 5 +----
src/chrome/locale/sco/torlauncher.properties | 5 +----
src/chrome/locale/si-LK/torlauncher.properties | 5 +----
src/chrome/locale/sk-SK/torlauncher.properties | 5 +----
src/chrome/locale/sk/torlauncher.properties | 5 +----
src/chrome/locale/sl-SI/torlauncher.properties | 5 +----
src/chrome/locale/sl/torlauncher.properties | 5 +----
src/chrome/locale/sn/torlauncher.properties | 5 +----
src/chrome/locale/so/torlauncher.properties | 5 +----
src/chrome/locale/son/torlauncher.properties | 5 +----
src/chrome/locale/sq-AL/torlauncher.properties | 5 +----
src/chrome/locale/sq/torlauncher.properties | 5 +----
src/chrome/locale/sr/torlauncher.properties | 5 +----
src/chrome/locale/sr(a)latin/torlauncher.properties | 5 +----
src/chrome/locale/st/torlauncher.properties | 5 +----
src/chrome/locale/su/torlauncher.properties | 5 +----
src/chrome/locale/sv/torlauncher.properties | 5 +----
src/chrome/locale/sw/torlauncher.properties | 5 +----
src/chrome/locale/szl/torlauncher.properties | 5 +----
src/chrome/locale/ta/torlauncher.properties | 5 +----
src/chrome/locale/te-IN/torlauncher.properties | 5 +----
src/chrome/locale/te/torlauncher.properties | 5 +----
src/chrome/locale/tg/torlauncher.properties | 5 +----
src/chrome/locale/th/torlauncher.properties | 5 +----
src/chrome/locale/ti/torlauncher.properties | 5 +----
src/chrome/locale/tk/torlauncher.properties | 5 +----
src/chrome/locale/tr/torlauncher.properties | 5 +----
src/chrome/locale/uk/torlauncher.properties | 5 +----
src/chrome/locale/ur-PK/torlauncher.properties | 5 +----
src/chrome/locale/ur/torlauncher.properties | 5 +----
src/chrome/locale/uz/torlauncher.properties | 5 +----
src/chrome/locale/ve/torlauncher.properties | 5 +----
src/chrome/locale/vi/torlauncher.properties | 5 +----
src/chrome/locale/wa/torlauncher.properties | 5 +----
src/chrome/locale/wo/torlauncher.properties | 5 +----
.../locale/zh-CN.GB2312/torlauncher.properties | 5 +----
src/chrome/locale/zh-CN/torlauncher.properties | 5 +----
src/chrome/locale/zh-HK/torlauncher.properties | 5 +----
src/chrome/locale/zh-TW/torlauncher.properties | 5 +----
src/chrome/locale/zh/torlauncher.properties | 5 +----
src/chrome/locale/zu/torlauncher.properties | 5 +----
src/modules/tl-util.jsm | 15 ++++++++++----
157 files changed, 186 insertions(+), 628 deletions(-)
diff --git a/src/chrome/locale/ach/torlauncher.properties b/src/chrome/locale/ach/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/ach/torlauncher.properties
+++ b/src/chrome/locale/ach/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ady/torlauncher.properties b/src/chrome/locale/ady/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/ady/torlauncher.properties
+++ b/src/chrome/locale/ady/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/af-ZA/torlauncher.properties b/src/chrome/locale/af-ZA/torlauncher.properties
index a2550db..376904d 100644
--- a/src/chrome/locale/af-ZA/torlauncher.properties
+++ b/src/chrome/locale/af-ZA/torlauncher.properties
@@ -36,15 +36,12 @@ torlauncher.done=Done
torlauncher.forAssistance=For assistance, contact %S
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/af/torlauncher.properties
+++ b/src/chrome/locale/af/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ak/torlauncher.properties b/src/chrome/locale/ak/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/ak/torlauncher.properties
+++ b/src/chrome/locale/ak/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/am-ET/torlauncher.properties b/src/chrome/locale/am-ET/torlauncher.properties
index 02be756..da5641e 100644
--- a/src/chrome/locale/am-ET/torlauncher.properties
+++ b/src/chrome/locale/am-ET/torlauncher.properties
@@ -39,15 +39,12 @@ torlauncher.forAssistance=For assistance, contact %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties
index be395d5..ca60006 100644
--- a/src/chrome/locale/am/torlauncher.properties
+++ b/src/chrome/locale/am/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties
index f66f3e8..d753034 100644
--- a/src/chrome/locale/ar/torlauncher.properties
+++ b/src/chrome/locale/ar/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=للمُساعدة, قُم بزيارة S%
torlauncher.copiedNLogMessages=تم النسخ. %S من رسائل سجل تور جاهزة للصقها في محرر نصوص أو رسالة بريد إلكتروني.
-torlauncher.bootstrapStatus.conn_dir=يتّصل بدليل التحويلات
-torlauncher.bootstrapStatus.handshake_dir=ينشئ اتصالا مشفرا بالدليل
+torlauncher.bootstrapStatus.onehop_create=ينشئ اتصالا مشفرا بالدليل
torlauncher.bootstrapStatus.requesting_status=يجلب حالة الشبكة
torlauncher.bootstrapStatus.loading_status=يحمّل حالة الشبكة
torlauncher.bootstrapStatus.loading_keys=يحمل شهادات السلطة
torlauncher.bootstrapStatus.requesting_descriptors=يطلب معلومات التحويلة
torlauncher.bootstrapStatus.loading_descriptors=يحمل معلومات التحويلة
-torlauncher.bootstrapStatus.conn_or=يتصل بشبكة تور
-torlauncher.bootstrapStatus.handshake_or=ينشئ دائرة تور
torlauncher.bootstrapStatus.done=تم الاتصال بشبكة تور
torlauncher.bootstrapWarning.done=تم
diff --git a/src/chrome/locale/arn/torlauncher.properties b/src/chrome/locale/arn/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/arn/torlauncher.properties
+++ b/src/chrome/locale/arn/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ast/torlauncher.properties b/src/chrome/locale/ast/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/ast/torlauncher.properties
+++ b/src/chrome/locale/ast/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties
index d0ea337..fa75f55 100644
--- a/src/chrome/locale/az/torlauncher.properties
+++ b/src/chrome/locale/az/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Köçürülmə tamamlandı. %S Tor giriş mesajları mətn dəyişdiricisi və ya email mesajına daxil edilməyə hazırdır.
-torlauncher.bootstrapStatus.conn_dir=Keçid kataloqu ilə əlaqə
-torlauncher.bootstrapStatus.handshake_dir=Şifrələnmiş kataloq əlaqəsinin yaradılması
+torlauncher.bootstrapStatus.onehop_create=Şifrələnmiş kataloq əlaqəsinin yaradılması
torlauncher.bootstrapStatus.requesting_status=Şəbəkə statusunun bərpası
torlauncher.bootstrapStatus.loading_status=Şəbəkə statusunun yüklənməsi
torlauncher.bootstrapStatus.loading_keys=Səlahiyyət sertifikatlarının yüklənməsi
torlauncher.bootstrapStatus.requesting_descriptors=Keçid məlumatının tələb edilməsi
torlauncher.bootstrapStatus.loading_descriptors=Keçid məlumatının yüklənməsi
-torlauncher.bootstrapStatus.conn_or=Tor şəbəkəsinə qoşulur
-torlauncher.bootstrapStatus.handshake_or=Tor dövrəsinin yaradılması
torlauncher.bootstrapStatus.done=Tor şəbəkəsi ilə əlaqə!
torlauncher.bootstrapWarning.done=oldu
diff --git a/src/chrome/locale/be/torlauncher.properties b/src/chrome/locale/be/torlauncher.properties
index e9d3c00..6ebfad7 100644
--- a/src/chrome/locale/be/torlauncher.properties
+++ b/src/chrome/locale/be/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/bg-BG/torlauncher.properties b/src/chrome/locale/bg-BG/torlauncher.properties
index a2550db..376904d 100644
--- a/src/chrome/locale/bg-BG/torlauncher.properties
+++ b/src/chrome/locale/bg-BG/torlauncher.properties
@@ -36,15 +36,12 @@ torlauncher.done=Done
torlauncher.forAssistance=For assistance, contact %S
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties
index 2e5f02e..47d6ce1 100644
--- a/src/chrome/locale/bg/torlauncher.properties
+++ b/src/chrome/locale/bg/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=За помощ посетете %S
torlauncher.copiedNLogMessages=Копирането е завършено. %S Съобщенията от Тор log-а са готови да бъдат поставени в текстов редактор или имейл.
-torlauncher.bootstrapStatus.conn_dir=Свързване с препредаващата директория
-torlauncher.bootstrapStatus.handshake_dir=Осъществяване на връзка с криптираната директория
+torlauncher.bootstrapStatus.onehop_create=Осъществяване на връзка с криптираната директория
torlauncher.bootstrapStatus.requesting_status=Получаване на информация за статуса на мрежата
torlauncher.bootstrapStatus.loading_status=Зареждане на информацията за статуса на мрежата
torlauncher.bootstrapStatus.loading_keys=Зареждане на сертификати от достоверен източник
torlauncher.bootstrapStatus.requesting_descriptors=Запитване за препредаваща информация
torlauncher.bootstrapStatus.loading_descriptors=Зареждане на препредаваща информация
-torlauncher.bootstrapStatus.conn_or=Свързване с Тор мрежата
-torlauncher.bootstrapStatus.handshake_or=Осъществяване на Тор верига
torlauncher.bootstrapStatus.done=Свързан с Тор мрежата!
torlauncher.bootstrapWarning.done=готов
diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties
index e607db2..e139293 100644
--- a/src/chrome/locale/bn-BD/torlauncher.properties
+++ b/src/chrome/locale/bn-BD/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=সহায়তার জন্য, %S এ যা
torlauncher.copiedNLogMessages=কপি সম্পূর্ণ। %S টর লগ বার্তা একটি টেক্সট এডিটর বা একটি ইমেইল বার্তা আটকানোর জন্য প্রস্তুত।
-torlauncher.bootstrapStatus.conn_dir=একটি রিলে ডিরেক্টরি সাথে সংযোগ স্থাপন
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=নেটওয়ার্ক স্থিতি পুনরুদ্ধার
torlauncher.bootstrapStatus.loading_status=নেটওয়ার্ক স্থিতি লোড হচ্ছে
torlauncher.bootstrapStatus.loading_keys=কর্তৃপক্ষ সার্টিফিকেট লোড হচ্ছে
torlauncher.bootstrapStatus.requesting_descriptors=রিলে তথ্য অনুরোধ
torlauncher.bootstrapStatus.loading_descriptors=রিলে তথ্য লোড হচ্ছে
-torlauncher.bootstrapStatus.conn_or=টর নেটওয়ার্কে সংযুক্ত হচ্ছে
-torlauncher.bootstrapStatus.handshake_or=একটি টর্ক সার্কিট স্থাপন
torlauncher.bootstrapStatus.done=টর নেটওয়ার্ক সংযুক্ত!
torlauncher.bootstrapWarning.done=সম্পন্ন
diff --git a/src/chrome/locale/bn-IN/torlauncher.properties b/src/chrome/locale/bn-IN/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/bn-IN/torlauncher.properties
+++ b/src/chrome/locale/bn-IN/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties
index ad26572..e807786 100644
--- a/src/chrome/locale/bn/torlauncher.properties
+++ b/src/chrome/locale/bn/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=সহায়তার জন্য, %S এ যা
torlauncher.copiedNLogMessages=কপি সম্পূর্ণ। %S টর লগ বার্তা একটি টেক্সট এডিটর বা একটি ইমেইল বার্তা আটকানোর জন্য প্রস্তুত।
-torlauncher.bootstrapStatus.conn_dir=একটি রিলে ডিরেক্টরি সাথে সংযোগ স্থাপন
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=নেটওয়ার্ক স্থিতি পুনরুদ্ধার
torlauncher.bootstrapStatus.loading_status=নেটওয়ার্ক স্থিতি লোড হচ্ছে
torlauncher.bootstrapStatus.loading_keys=কর্তৃপক্ষ সার্টিফিকেট লোড হচ্ছে
torlauncher.bootstrapStatus.requesting_descriptors=রিলে তথ্য অনুরোধ
torlauncher.bootstrapStatus.loading_descriptors=রিলে তথ্য লোড হচ্ছে
-torlauncher.bootstrapStatus.conn_or=টর নেটওয়ার্কে সংযুক্ত হচ্ছে
-torlauncher.bootstrapStatus.handshake_or=একটি টর্ক সার্কিট স্থাপন
torlauncher.bootstrapStatus.done=টর নেটওয়ার্ক সংযুক্ত!
torlauncher.bootstrapWarning.done=সম্পন্ন
diff --git a/src/chrome/locale/bo/torlauncher.properties b/src/chrome/locale/bo/torlauncher.properties
index 47b407c..db5c207 100644
--- a/src/chrome/locale/bo/torlauncher.properties
+++ b/src/chrome/locale/bo/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/br/torlauncher.properties b/src/chrome/locale/br/torlauncher.properties
index 90711bd..14fdad2 100644
--- a/src/chrome/locale/br/torlauncher.properties
+++ b/src/chrome/locale/br/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=O kevreañ d'ar genrouedad Tor
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/bs/torlauncher.properties b/src/chrome/locale/bs/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/bs/torlauncher.properties
+++ b/src/chrome/locale/bs/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ca-ES/torlauncher.properties b/src/chrome/locale/ca-ES/torlauncher.properties
index d82d688..65407db 100644
--- a/src/chrome/locale/ca-ES/torlauncher.properties
+++ b/src/chrome/locale/ca-ES/torlauncher.properties
@@ -31,15 +31,12 @@
# torlauncher.forAssistance=For assistance, contact %S
-# torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-# torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+# torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
# torlauncher.bootstrapStatus.requesting_status=Retrieving network status
# torlauncher.bootstrapStatus.loading_status=Loading network status
# torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
# torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
# torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-# torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-# torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
# torlauncher.bootstrapStatus.done=Connected to the Tor network!
# torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties
index 598314e..7c289de 100644
--- a/src/chrome/locale/ca/torlauncher.properties
+++ b/src/chrome/locale/ca/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Per a més ajuda, visiteu %S
torlauncher.copiedNLogMessages=Còpia completada. Els missatges del registre de %S Tor ja es poden enganxar en un editor de text o un missatge de correu.
-torlauncher.bootstrapStatus.conn_dir=S'està connectant amb un directori repetidor
-torlauncher.bootstrapStatus.handshake_dir=S'està establint una connexió xifrada amb un directori
+torlauncher.bootstrapStatus.onehop_create=S'està establint una connexió xifrada amb un directori
torlauncher.bootstrapStatus.requesting_status=S'està rebent l'estat de la xarxa
torlauncher.bootstrapStatus.loading_status=S'està carregant l'estat de la xarxa
torlauncher.bootstrapStatus.loading_keys=S'estan carregant els certificats d'autoritat
torlauncher.bootstrapStatus.requesting_descriptors=S'està demanant informació del repetidor
torlauncher.bootstrapStatus.loading_descriptors=S'està carregant la informació del repetidor
-torlauncher.bootstrapStatus.conn_or=S'està connectant a la xarxa Tor
-torlauncher.bootstrapStatus.handshake_or=S'està establint un circuit Tor
torlauncher.bootstrapStatus.done=S'ha connectat a la xarxa Tor!
torlauncher.bootstrapWarning.done=fet
diff --git a/src/chrome/locale/cs-CZ/torlauncher.properties b/src/chrome/locale/cs-CZ/torlauncher.properties
index 02be756..da5641e 100644
--- a/src/chrome/locale/cs-CZ/torlauncher.properties
+++ b/src/chrome/locale/cs-CZ/torlauncher.properties
@@ -39,15 +39,12 @@ torlauncher.forAssistance=For assistance, contact %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties
index 2a21d5f..7b13d0f 100644
--- a/src/chrome/locale/cs/torlauncher.properties
+++ b/src/chrome/locale/cs/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Pro asistenci navštivte %S
torlauncher.copiedNLogMessages=Kopírování dokončeno. %S zprávy protokolu Tor jsou připraveny k vložení do textového editoru nebo e-mailu.
-torlauncher.bootstrapStatus.conn_dir=Připojování do adresáře uzlů
-torlauncher.bootstrapStatus.handshake_dir=Spojování s šifrovaným adresářem
+torlauncher.bootstrapStatus.onehop_create=Spojování s šifrovaným adresářem
torlauncher.bootstrapStatus.requesting_status=Kontrola stavu sítě
torlauncher.bootstrapStatus.loading_status=Načítání stavu sítě
torlauncher.bootstrapStatus.loading_keys=Nahrávání certifikátů autorit
torlauncher.bootstrapStatus.requesting_descriptors=Zjišťování informací o uzlu
torlauncher.bootstrapStatus.loading_descriptors=Nahrávání informací o uzlu
-torlauncher.bootstrapStatus.conn_or=Připojování k síti Tor
-torlauncher.bootstrapStatus.handshake_or=Navazování okruhu Tor
torlauncher.bootstrapStatus.done=Připojení k síti Tor dokončeno!
torlauncher.bootstrapWarning.done=hotovo
diff --git a/src/chrome/locale/csb/torlauncher.properties b/src/chrome/locale/csb/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/csb/torlauncher.properties
+++ b/src/chrome/locale/csb/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/cv/torlauncher.properties b/src/chrome/locale/cv/torlauncher.properties
index d629694..a227407 100644
--- a/src/chrome/locale/cv/torlauncher.properties
+++ b/src/chrome/locale/cv/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/cy/torlauncher.properties b/src/chrome/locale/cy/torlauncher.properties
index 354ef89..dceaf38 100644
--- a/src/chrome/locale/cy/torlauncher.properties
+++ b/src/chrome/locale/cy/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copio wedi gorffen. Mae %S o negeseuon log Tor yn barod i'u gludo mewn golygydd testun neu neges ebost.
-torlauncher.bootstrapStatus.conn_dir=Cysylltu i cyfeiriadur cyfnewid
-torlauncher.bootstrapStatus.handshake_dir=Yn sefydlu cysylltiad cyfeiriadur amgryptiedig
+torlauncher.bootstrapStatus.onehop_create=Yn sefydlu cysylltiad cyfeiriadur amgryptiedig
torlauncher.bootstrapStatus.requesting_status=Yn adalw statws y rhwydwaith
torlauncher.bootstrapStatus.loading_status=Yn llwytho statws rhwydwaith
torlauncher.bootstrapStatus.loading_keys=Llwytho tystysgrifiadau awrurdod
torlauncher.bootstrapStatus.requesting_descriptors=Gofyn am gwybodaeth cyfnewid
torlauncher.bootstrapStatus.loading_descriptors=Llwytho gwybodaeth cyfnewid
-torlauncher.bootstrapStatus.conn_or=Cysylltu â'r rhwydwaith Tor
-torlauncher.bootstrapStatus.handshake_or=Yn sefydlu cylched Tor
torlauncher.bootstrapStatus.done=Cysylltwyd â rhwydwaith Tor!
torlauncher.bootstrapWarning.done=wedi gorffen
diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties
index c959ed1..b5587cb 100644
--- a/src/chrome/locale/da/torlauncher.properties
+++ b/src/chrome/locale/da/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For hjælp, besøg %S
torlauncher.copiedNLogMessages=Kopieringen er gennemført. %S logbeskeder fra Tor er klar til at blive sat ind i et tekstdokument eller en e-mail.
-torlauncher.bootstrapStatus.conn_dir=Opretter forbindelse til en relæmappe
-torlauncher.bootstrapStatus.handshake_dir=Etablerer en krypteret mappe forbindelse
+torlauncher.bootstrapStatus.onehop_create=Etablerer en krypteret mappe forbindelse
torlauncher.bootstrapStatus.requesting_status=Henter netværksstatus
torlauncher.bootstrapStatus.loading_status=Indlæser netværksstatus
torlauncher.bootstrapStatus.loading_keys=Indlæser nøglecentercertifikater
torlauncher.bootstrapStatus.requesting_descriptors=Anmoder om relæ information
torlauncher.bootstrapStatus.loading_descriptors=Indlæser relæinformation
-torlauncher.bootstrapStatus.conn_or=Opretter forbindelse til Tor-netværket
-torlauncher.bootstrapStatus.handshake_or=Etablerer et Tor-kredsløb
torlauncher.bootstrapStatus.done=Forbundet til Tor-netværket!
torlauncher.bootstrapWarning.done=færdig
diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties
index 18afad1..c2f223a 100644
--- a/src/chrome/locale/de/torlauncher.properties
+++ b/src/chrome/locale/de/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Falls Sie Hilfe benötigen, kontaktieren Sie %S
torlauncher.copiedNLogMessages=Kopie vollständig. %S Tor-Protokollnachrichten sind bereit, um in eine Textbearbeitung oder in eine E-Mail-Nachricht eingefügt zu werden.
-torlauncher.bootstrapStatus.conn_dir=Zu einem Relaisverzeichnis wird verbunden
-torlauncher.bootstrapStatus.handshake_dir=Es wird eine verschlüsselte Verbindung zu einem Verzeichnis hergestellt
+torlauncher.bootstrapStatus.onehop_create=Es wird eine verschlüsselte Verbindung zu einem Verzeichnis hergestellt
torlauncher.bootstrapStatus.requesting_status=Netzwerkstatus wird abgerufen
torlauncher.bootstrapStatus.loading_status=Netzwerkstatus wird geladen
torlauncher.bootstrapStatus.loading_keys=Autorisierungszertifikate werden geladen
torlauncher.bootstrapStatus.requesting_descriptors=Relaisinformationen werden angefordert
torlauncher.bootstrapStatus.loading_descriptors=Relaisinformationen werden geladen
-torlauncher.bootstrapStatus.conn_or=Zum Tor-Netzwerk wird verbunden
-torlauncher.bootstrapStatus.handshake_or=Tor-Kanal wird hergestellt
torlauncher.bootstrapStatus.done=Zum Tor-Netzwerk wurde verbunden!
torlauncher.bootstrapWarning.done=abgeschlossen
diff --git a/src/chrome/locale/dz/torlauncher.properties b/src/chrome/locale/dz/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/dz/torlauncher.properties
+++ b/src/chrome/locale/dz/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/el-GR/torlauncher.properties b/src/chrome/locale/el-GR/torlauncher.properties
index a2550db..376904d 100644
--- a/src/chrome/locale/el-GR/torlauncher.properties
+++ b/src/chrome/locale/el-GR/torlauncher.properties
@@ -36,15 +36,12 @@ torlauncher.done=Done
torlauncher.forAssistance=For assistance, contact %S
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties
index 3457ae9..3d93576 100644
--- a/src/chrome/locale/el/torlauncher.properties
+++ b/src/chrome/locale/el/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Για βοήθεια, επισκεφτείτε %S
torlauncher.copiedNLogMessages=Η αντιγραφή ολοκληρώθηκε. %S μηνύματα καταγραφής είναι έτοιμα να επικολληθούν σε ένα κειμενογράφο ή ένα μήνυμα ηλεκτρονικού ταχυδρομείου.
-torlauncher.bootstrapStatus.conn_dir=Σύνδεση στη διεύθυνση αναμεταδοτών
-torlauncher.bootstrapStatus.handshake_dir=Πραγματοποιήθηκε σύνδεση σε κρυπτογραφημένο κατάλογο
+torlauncher.bootstrapStatus.onehop_create=Πραγματοποιήθηκε σύνδεση σε κρυπτογραφημένο κατάλογο
torlauncher.bootstrapStatus.requesting_status=Ανάκτηση της κατάστασης του δικτύου
torlauncher.bootstrapStatus.loading_status=Φόρτωση της κατάστασης του δικτύου
torlauncher.bootstrapStatus.loading_keys=Φόρτωση των πιστοποιητικών του φορέα
torlauncher.bootstrapStatus.requesting_descriptors=Γίνεται αίτηση για πληροφορίες των αναμεταδοτών
torlauncher.bootstrapStatus.loading_descriptors=Φόρτωση πληροφοριών αναμεταδότη
-torlauncher.bootstrapStatus.conn_or=Δημιουργια σύνδεσης στο δίκτυο Tor
-torlauncher.bootstrapStatus.handshake_or=Σύνδεση σε ένα κύκλωμα Tor
torlauncher.bootstrapStatus.done=Συνδεθήκατε στο δίκτυο Tor!
torlauncher.bootstrapWarning.done=έγινε
diff --git a/src/chrome/locale/en-GB/torlauncher.properties b/src/chrome/locale/en-GB/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/en-GB/torlauncher.properties
+++ b/src/chrome/locale/en-GB/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties
index a4d097a..ca9774b 100644
--- a/src/chrome/locale/en/torlauncher.properties
+++ b/src/chrome/locale/en/torlauncher.properties
@@ -52,15 +52,31 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.starting=Starting
+torlauncher.bootstrapStatus.conn_pt=Connecting to bridge
+torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge
+torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy
+torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy
+torlauncher.bootstrapStatus.conn=Connecting to a Tor relay
+torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay
+torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay
+torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
+torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information
+torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge
+torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge
+torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy
+torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy
+torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay
+torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay
+torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay
+torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay
+torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties
index a3e7187..f2e6418 100644
--- a/src/chrome/locale/eo/torlauncher.properties
+++ b/src/chrome/locale/eo/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Kopiado estas preta. %S Tor-protokolaj mesaĝoj pretas por enigi ilin en tekstredaktilon aŭ retpoŝtmesaĝon.
-torlauncher.bootstrapStatus.conn_dir=Konektante al relajsa dosierujo
-torlauncher.bootstrapStatus.handshake_dir=Starigante ĉifritan dosierujan konekton
+torlauncher.bootstrapStatus.onehop_create=Starigante ĉifritan dosierujan konekton
torlauncher.bootstrapStatus.requesting_status=Ricevante retan staton
torlauncher.bootstrapStatus.loading_status=Ŝarĝante retan staton
torlauncher.bootstrapStatus.loading_keys=Ŝarĝante aŭtoritatajn atestilojn
torlauncher.bootstrapStatus.requesting_descriptors=Petante relajsajn informojn
torlauncher.bootstrapStatus.loading_descriptors=Ŝarĝante relajsajn informojn
-torlauncher.bootstrapStatus.conn_or=Konektante al Tor-reto
-torlauncher.bootstrapStatus.handshake_or=Starigante Tor-cirkviton
torlauncher.bootstrapStatus.done=Konektita al Tor-reto
torlauncher.bootstrapWarning.done=farite
diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties
index e3b43c4..fcffd36 100644
--- a/src/chrome/locale/es-AR/torlauncher.properties
+++ b/src/chrome/locale/es-AR/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Para asistencia, visitá %S
torlauncher.copiedNLogMessages=Copia completa. %S registros de bitácora de Tor están listos para ser pegados en un editor de textos o un correo electrónico.
-torlauncher.bootstrapStatus.conn_dir=Conectando a un directorio de relevos
-torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión encriptada al directorio
+torlauncher.bootstrapStatus.onehop_create=Estableciendo una conexión encriptada al directorio
torlauncher.bootstrapStatus.requesting_status=Obteniendo el estado de red
torlauncher.bootstrapStatus.loading_status=Cargando el estado de red
torlauncher.bootstrapStatus.loading_keys=Cargando certificados de autoridad
torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de relevos
torlauncher.bootstrapStatus.loading_descriptors=Cargando información de relevos
-torlauncher.bootstrapStatus.conn_or=Conectando a la red de Tor
-torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito Tor
torlauncher.bootstrapStatus.done=¡Conectado a la red de Tor!
torlauncher.bootstrapWarning.done=hecho
diff --git a/src/chrome/locale/es-CL/torlauncher.properties b/src/chrome/locale/es-CL/torlauncher.properties
index 129467e..15a3fc1 100644
--- a/src/chrome/locale/es-CL/torlauncher.properties
+++ b/src/chrome/locale/es-CL/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/es-CO/torlauncher.properties b/src/chrome/locale/es-CO/torlauncher.properties
index 9a1b292..6fffd6f 100644
--- a/src/chrome/locale/es-CO/torlauncher.properties
+++ b/src/chrome/locale/es-CO/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Conectando a la red de Tor
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties
index 60ba06f..67d1f87 100644
--- a/src/chrome/locale/es-MX/torlauncher.properties
+++ b/src/chrome/locale/es-MX/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Si necesitas ayuda, visita %S
torlauncher.copiedNLogMessages=Copia completa. %S mensajes del registro de Tor están listos para ser pegados en un editor de texto o mensaje de correo electrónico.
-torlauncher.bootstrapStatus.conn_dir=Conectando a un directorio de retransmisión
-torlauncher.bootstrapStatus.handshake_dir=Estableciendo conexión con un directorio encriptado.
+torlauncher.bootstrapStatus.onehop_create=Estableciendo conexión con un directorio encriptado.
torlauncher.bootstrapStatus.requesting_status=Recuperando estado de la red
torlauncher.bootstrapStatus.loading_status=Cargando estado de red.
torlauncher.bootstrapStatus.loading_keys=Cargando certificados de autoridad.
torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de retransmisión
torlauncher.bootstrapStatus.loading_descriptors=Cargando información del relé
-torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor
-torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito Tor
torlauncher.bootstrapStatus.done=¡Conectado a la red Tor!
torlauncher.bootstrapWarning.done=hecho
diff --git a/src/chrome/locale/es-NI/torlauncher.properties b/src/chrome/locale/es-NI/torlauncher.properties
index d04cac5..97851ac 100644
--- a/src/chrome/locale/es-NI/torlauncher.properties
+++ b/src/chrome/locale/es-NI/torlauncher.properties
@@ -36,15 +36,12 @@ torlauncher.done=Done
torlauncher.forAssistance=For assistance, contact %S
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties
index 31ffb6a..bbfcab8 100644
--- a/src/chrome/locale/es/torlauncher.properties
+++ b/src/chrome/locale/es/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Para asistencia, visita %S
torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor están listos para ser pegados en un editor de texto o en un mensaje de correo electrónico.
-torlauncher.bootstrapStatus.conn_dir=Conectando a un repositorio ('Directory') de repetidores ('relays')
-torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión cifrada con el repositorio de repetidores
+torlauncher.bootstrapStatus.onehop_create=Estableciendo una conexión cifrada con el repositorio de repetidores
torlauncher.bootstrapStatus.requesting_status=Recopilando el estado de la red
torlauncher.bootstrapStatus.loading_status=Cargando el estado de la red
torlauncher.bootstrapStatus.loading_keys=Cargando los certificados de autoridades
torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información del repetidor
torlauncher.bootstrapStatus.loading_descriptors=Cargando la información del repetidor
-torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor
-torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito a través de Tor
torlauncher.bootstrapStatus.done=¡Conectado a la red Tor!
torlauncher.bootstrapWarning.done=terminado
diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties
index f0cc216..2be485e 100644
--- a/src/chrome/locale/et/torlauncher.properties
+++ b/src/chrome/locale/et/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Abi saamiseks külasta %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Tor võrgustikuga ühendumine
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=valmis
diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties
index 16a8f3b..491ba33 100644
--- a/src/chrome/locale/eu/torlauncher.properties
+++ b/src/chrome/locale/eu/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Laguntzako lortzeko, bisita ezazu %S
torlauncher.copiedNLogMessages=Kopia burutu da. %S Tor erregistro mezuak prest daude testu editore edo email mezu batean itsasteko.
-torlauncher.bootstrapStatus.conn_dir=Errele direktorio batera konektatzen
-torlauncher.bootstrapStatus.handshake_dir=Enkriptatutako direktorio batera konexioa ezartzen
+torlauncher.bootstrapStatus.onehop_create=Enkriptatutako direktorio batera konexioa ezartzen
torlauncher.bootstrapStatus.requesting_status=Sarearen egoera eskuratzen
torlauncher.bootstrapStatus.loading_status=Sarearen egoera kargatzen
torlauncher.bootstrapStatus.loading_keys=Aginpide ziurtagiriak kargatzen
torlauncher.bootstrapStatus.requesting_descriptors=Errele informazioa eskatzen
torlauncher.bootstrapStatus.loading_descriptors=Errele informazioa kargatzen
-torlauncher.bootstrapStatus.conn_or=Tor sarera konektatzen
-torlauncher.bootstrapStatus.handshake_or=Tor zirkuitu bat ezartzen
torlauncher.bootstrapStatus.done=Tor sarera konektatuta!
torlauncher.bootstrapWarning.done=eginda
diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties
index 169d5e2..ec83f00 100644
--- a/src/chrome/locale/fa/torlauncher.properties
+++ b/src/chrome/locale/fa/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=برای کمک، %S را ببینید.
torlauncher.copiedNLogMessages=کپی کامل شد. %S پیامهای ثبت شده آماده است تا Paste شود در ویرایشگر متن یا یک ایمیل.
-torlauncher.bootstrapStatus.conn_dir=اتصال به یک فهرست بازپخش
-torlauncher.bootstrapStatus.handshake_dir=برپایی یک اتصال فهرست رمزبندی شده
+torlauncher.bootstrapStatus.onehop_create=برپایی یک اتصال فهرست رمزبندی شده
torlauncher.bootstrapStatus.requesting_status=بازیابی وضیعت شبکه
torlauncher.bootstrapStatus.loading_status=بارگذاری وضیعت شبکه
torlauncher.bootstrapStatus.loading_keys=بارگذاری مجوز ها
torlauncher.bootstrapStatus.requesting_descriptors=درخواست اطلاعات باز پخش
torlauncher.bootstrapStatus.loading_descriptors=بارگذاری اطلاعات بازپخش
-torlauncher.bootstrapStatus.conn_or=درحال اتصال به شبکه تُر
-torlauncher.bootstrapStatus.handshake_or=برپایی یک جریان تُر
torlauncher.bootstrapStatus.done=به شبکه تور متصل شد!
torlauncher.bootstrapWarning.done=انجام شد
diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties
index 5c94c89..d90ee6d 100644
--- a/src/chrome/locale/fi/torlauncher.properties
+++ b/src/chrome/locale/fi/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Tukea saat sivustolta %S
torlauncher.copiedNLogMessages=Kopionti suoritettu. %S Tor-lokiviestiä on valmiina kopiotavaksi tekstimuokkaimeen tai sähköpostiviestiin.
-torlauncher.bootstrapStatus.conn_dir=Yhdistetään reititinhakemistoon
-torlauncher.bootstrapStatus.handshake_dir=Muodostetaan suojattu yhteys hakemistoon
+torlauncher.bootstrapStatus.onehop_create=Muodostetaan suojattu yhteys hakemistoon
torlauncher.bootstrapStatus.requesting_status=Noudetaan verkon tila
torlauncher.bootstrapStatus.loading_status=Ladataan verkon tila
torlauncher.bootstrapStatus.loading_keys=Ladataan juurivarmenteita
torlauncher.bootstrapStatus.requesting_descriptors=Pyydetään reititintietoja
torlauncher.bootstrapStatus.loading_descriptors=Ladataan reititintietoja
-torlauncher.bootstrapStatus.conn_or=Yhdistetään Tor-verkkoon
-torlauncher.bootstrapStatus.handshake_or=Muodostetaan Tor-kiertotie
torlauncher.bootstrapStatus.done=Yhdistetty Tor-verkkoon!
torlauncher.bootstrapWarning.done=valmis
diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties
index 41a5ee3..e0fbc2b 100644
--- a/src/chrome/locale/fil/torlauncher.properties
+++ b/src/chrome/locale/fil/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Para sa gabay o tulong, bisitahin ang %S
torlauncher.copiedNLogMessages=Kumpleto na ang Pag-kopya. %S Ang mga log messages ng Tor ay handa na ma-paste sa isang text editor o sa e-mail message.
-torlauncher.bootstrapStatus.conn_dir=Kumokonekta sa isang direktoryo ng relay
-torlauncher.bootstrapStatus.handshake_dir= Itinatatag ang isang naka-encrypt na direktoryo ng koneksyon
+torlauncher.bootstrapStatus.onehop_create= Itinatatag ang isang naka-encrypt na direktoryo ng koneksyon
torlauncher.bootstrapStatus.requesting_status=Kinukuha ang katayuan ng network
torlauncher.bootstrapStatus.loading_status=Ikinakarga ang katayuan ng network
torlauncher.bootstrapStatus.loading_keys=Ikinakarga ang mga sertipiko ng awtoridad
torlauncher.bootstrapStatus.requesting_descriptors=Humihiling ng impormasyon tungkol sa relay
torlauncher.bootstrapStatus.loading_descriptors=Ikinakarga ang impormasyon tungkol sa relay
-torlauncher.bootstrapStatus.conn_or=Kumukonekta sa network ng Tor
-torlauncher.bootstrapStatus.handshake_or=Nagtatatag ng Tor circuit
torlauncher.bootstrapStatus.done=Nakakonekta sa Tor Network.
torlauncher.bootstrapWarning.done=tapos na
diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/fo/torlauncher.properties
+++ b/src/chrome/locale/fo/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties
index bbee1ff..1e1ad99 100644
--- a/src/chrome/locale/fr-CA/torlauncher.properties
+++ b/src/chrome/locale/fr-CA/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Pour de l’assistance, visiter %S
torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel.
-torlauncher.bootstrapStatus.conn_dir=Connexion à un annuaire de relais
-torlauncher.bootstrapStatus.handshake_dir=Mise en place d’une connexion chiffrée à l’annuaire
+torlauncher.bootstrapStatus.onehop_create=Mise en place d’une connexion chiffrée à l’annuaire
torlauncher.bootstrapStatus.requesting_status=Récupération de l’état du réseau
torlauncher.bootstrapStatus.loading_status=Chargement de l’état du réseau
torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d’autorité
torlauncher.bootstrapStatus.requesting_descriptors=Demande d’informations sur le relais
torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais
-torlauncher.bootstrapStatus.conn_or=Connexion au réseau Tor
-torlauncher.bootstrapStatus.handshake_or=Mise en place d’un circuit Tor
torlauncher.bootstrapStatus.done=Vous êtes connecté au réseau Tor!
torlauncher.bootstrapWarning.done=effectué
diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties
index c44fa36..a30a07f 100644
--- a/src/chrome/locale/fr/torlauncher.properties
+++ b/src/chrome/locale/fr/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Pour de l’assistance, visiter %S
torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être collés dans un éditeur de texte ou un courriel.
-torlauncher.bootstrapStatus.conn_dir=Connexion à un annuaire de relais
-torlauncher.bootstrapStatus.handshake_dir=Mise en place d’une connexion chiffrée à l’annuaire
+torlauncher.bootstrapStatus.onehop_create=Mise en place d’une connexion chiffrée à l’annuaire
torlauncher.bootstrapStatus.requesting_status=Récupération de l’état du réseau
torlauncher.bootstrapStatus.loading_status=Chargement de l’état du réseau
torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d’autorité
torlauncher.bootstrapStatus.requesting_descriptors=Demande d’informations sur le relais
torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais
-torlauncher.bootstrapStatus.conn_or=Connexion au réseau Tor
-torlauncher.bootstrapStatus.handshake_or=Mise en place d’un circuit Tor
torlauncher.bootstrapStatus.done=Vous êtes connecté au réseau Tor !
torlauncher.bootstrapWarning.done=terminé
diff --git a/src/chrome/locale/fur/torlauncher.properties b/src/chrome/locale/fur/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/fur/torlauncher.properties
+++ b/src/chrome/locale/fur/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy/torlauncher.properties
index 3da506c..7884935 100644
--- a/src/chrome/locale/fy/torlauncher.properties
+++ b/src/chrome/locale/fy/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties
index 27c4568..6d233f5 100644
--- a/src/chrome/locale/ga/torlauncher.properties
+++ b/src/chrome/locale/ga/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Tabhair cuairt ar %S le cúnamh a fháil
torlauncher.copiedNLogMessages=Cóipeáílte. Tá %S teachtaireacht ón logchomhad Tor réidh le greamú in eagarthóir téacs nó i dteachtaireacht rphoist.
-torlauncher.bootstrapStatus.conn_dir=Ag ceangal le heolaire athsheachadán
-torlauncher.bootstrapStatus.handshake_dir=Ceangal criptithe le heolaire á bhunú
+torlauncher.bootstrapStatus.onehop_create=Ceangal criptithe le heolaire á bhunú
torlauncher.bootstrapStatus.requesting_status=Stádas an líonra á fháil
torlauncher.bootstrapStatus.loading_status=Stádas an líonra á lódáil
torlauncher.bootstrapStatus.loading_keys=Teastais an údaráis á lódáil
torlauncher.bootstrapStatus.requesting_descriptors=Eolas faoin athsheachadán á iarraidh
torlauncher.bootstrapStatus.loading_descriptors=Eolas faoin athsheachadán á lódáil
-torlauncher.bootstrapStatus.conn_or=Ag ceangal le líonra Tor
-torlauncher.bootstrapStatus.handshake_or=Ciorcad Tor á bhunú
torlauncher.bootstrapStatus.done=Tá tú ceangailte le líonra Tor!
torlauncher.bootstrapWarning.done=críochnaithe
diff --git a/src/chrome/locale/gl/torlauncher.properties b/src/chrome/locale/gl/torlauncher.properties
index 44c4500..70abb19 100644
--- a/src/chrome/locale/gl/torlauncher.properties
+++ b/src/chrome/locale/gl/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Conectando co directorio de repetidores
-torlauncher.bootstrapStatus.handshake_dir=Estabelecendo unha conexión cifrada co directorio
+torlauncher.bootstrapStatus.onehop_create=Estabelecendo unha conexión cifrada co directorio
torlauncher.bootstrapStatus.requesting_status=Recuperando o estado da rede
torlauncher.bootstrapStatus.loading_status=Cargando o estado da rede
torlauncher.bootstrapStatus.loading_keys=Cargando os certificados de autoridade
torlauncher.bootstrapStatus.requesting_descriptors=Solicitando a información do repetidor
torlauncher.bootstrapStatus.loading_descriptors=Cargando información do repetidor
-torlauncher.bootstrapStatus.conn_or=Conexión á rede Tor
-torlauncher.bootstrapStatus.handshake_or=Estabelecendo o circuíto Tor
torlauncher.bootstrapStatus.done=Conectado á rede Tor!
torlauncher.bootstrapWarning.done=feito
diff --git a/src/chrome/locale/gu-IN/torlauncher.properties b/src/chrome/locale/gu-IN/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/gu-IN/torlauncher.properties
+++ b/src/chrome/locale/gu-IN/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties
index f6bc2fe..1c4ff0f 100644
--- a/src/chrome/locale/gu/torlauncher.properties
+++ b/src/chrome/locale/gu/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/gun/torlauncher.properties b/src/chrome/locale/gun/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/gun/torlauncher.properties
+++ b/src/chrome/locale/gun/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ha/torlauncher.properties b/src/chrome/locale/ha/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/ha/torlauncher.properties
+++ b/src/chrome/locale/ha/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties
index 68c61e1..118e515 100644
--- a/src/chrome/locale/he/torlauncher.properties
+++ b/src/chrome/locale/he/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=לתמיכה, בקר ב-%S
torlauncher.copiedNLogMessages=ההעתקה הושלמה. %S הודעות יומן אירועים של Tor מוכנות להדבקה לתוך עורך מלל או להודעת דוא"ל.
-torlauncher.bootstrapStatus.conn_dir=מתחבר לסיפריית ממסרים
-torlauncher.bootstrapStatus.handshake_dir=מקים חיבור סיפרייה מוצפן
+torlauncher.bootstrapStatus.onehop_create=מקים חיבור סיפרייה מוצפן
torlauncher.bootstrapStatus.requesting_status=מאחזר מיצב רשת
torlauncher.bootstrapStatus.loading_status=טוען מיצב רשת
torlauncher.bootstrapStatus.loading_keys=טוען אישורי רָשׁוּת
torlauncher.bootstrapStatus.requesting_descriptors=מבקש מידע ממסר
torlauncher.bootstrapStatus.loading_descriptors=טוען מידע ממסר
-torlauncher.bootstrapStatus.conn_or=מתחבר אל רשת Tor
-torlauncher.bootstrapStatus.handshake_or=מקים מעגל Tor
torlauncher.bootstrapStatus.done=מחובר לרשת Tor!
torlauncher.bootstrapWarning.done=בוצע
diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi/torlauncher.properties
index d530ccb..a7f07f4 100644
--- a/src/chrome/locale/hi/torlauncher.properties
+++ b/src/chrome/locale/hi/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=सहायता के लिए, %S पर जा
torlauncher.copiedNLogMessages=कॉपी कॉपी करें। %S टोर लॉग संदेश टेक्स्ट एडिटर या ईमेल संदेश में चिपकने के लिए तैयार हैं।
-torlauncher.bootstrapStatus.conn_dir=एक रिले निर्देशिका से कनेक्ट कर रहा है
-torlauncher.bootstrapStatus.handshake_dir=एक एन्क्रिप्टेड निर्देशिका कनेक्शन स्थापित किया जा रहा है
+torlauncher.bootstrapStatus.onehop_create=एक एन्क्रिप्टेड निर्देशिका कनेक्शन स्थापित किया जा रहा है
torlauncher.bootstrapStatus.requesting_status=नेटवर्क की स्थिति को पुनः प्राप्त करना
torlauncher.bootstrapStatus.loading_status=नेटवर्क स्थिति लोड हो रहा है
torlauncher.bootstrapStatus.loading_keys=प्राधिकरण प्रमाण पत्र लोड हो रहा है
torlauncher.bootstrapStatus.requesting_descriptors=रिले जानकारी का अनुरोध
torlauncher.bootstrapStatus.loading_descriptors=रिले जानकारी लोड हो रहा है
-torlauncher.bootstrapStatus.conn_or=टोर संजाल से जुड़ रहा है
-torlauncher.bootstrapStatus.handshake_or=एक टोर सर्किट की स्थापना की जा रही है
torlauncher.bootstrapStatus.done=टोर नेटवर्क से जुड़ा हुआ है!
torlauncher.bootstrapWarning.done=सम्पन्न
diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties
index 3a4c1e7..c13ba37 100644
--- a/src/chrome/locale/hr-HR/torlauncher.properties
+++ b/src/chrome/locale/hr-HR/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Za pomoć posjetite %S
torlauncher.copiedNLogMessages=Kopiranje završeno. %S Tor zapisi su spremni za lijepljenje u uređivač teksta ili email poruku.
-torlauncher.bootstrapStatus.conn_dir=Spajanje na direktorij releja
-torlauncher.bootstrapStatus.handshake_dir=Uspostavljanje enkriptirane veze na direktorij
+torlauncher.bootstrapStatus.onehop_create=Uspostavljanje enkriptirane veze na direktorij
torlauncher.bootstrapStatus.requesting_status=Dohvaćanje statusa mreže
torlauncher.bootstrapStatus.loading_status=Učitavanje statusa mreže
torlauncher.bootstrapStatus.loading_keys=Učitavanje certifikata autoriteta
torlauncher.bootstrapStatus.requesting_descriptors=Zahtjevanje informacija o releju
torlauncher.bootstrapStatus.loading_descriptors=Učitavanje informacija o releju
-torlauncher.bootstrapStatus.conn_or=Spajanje na Tor mrežu
-torlauncher.bootstrapStatus.handshake_or=Uspostavljanje Tor kruga
torlauncher.bootstrapStatus.done=Spojen na Tor mrežu!
torlauncher.bootstrapWarning.done=gotovo
diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties
index 1424083..5a4a8d8 100644
--- a/src/chrome/locale/hr/torlauncher.properties
+++ b/src/chrome/locale/hr/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Spajanje na Tor mrežu
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ht/torlauncher.properties b/src/chrome/locale/ht/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/ht/torlauncher.properties
+++ b/src/chrome/locale/ht/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties
index 74c7ae4..c9dfdf3 100644
--- a/src/chrome/locale/hu/torlauncher.properties
+++ b/src/chrome/locale/hu/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Segítségért látogassa meg: %S
torlauncher.copiedNLogMessages=Másolás kész. %S Tor naplóüzenet áll készen a beillesztésre egy szövegszerkesztőbe vagy egy email üzenetbe.
-torlauncher.bootstrapStatus.conn_dir=Csatlakozás egy Elosztó címtárhoz
-torlauncher.bootstrapStatus.handshake_dir=Titkosított címtárkapcsolat létrehozása
+torlauncher.bootstrapStatus.onehop_create=Titkosított címtárkapcsolat létrehozása
torlauncher.bootstrapStatus.requesting_status=Hálózat státuszának lekérdezése
torlauncher.bootstrapStatus.loading_status=Hálózat státuszának betöltése
torlauncher.bootstrapStatus.loading_keys=Tanúsítványkiadó tanúsítványok betöltése
torlauncher.bootstrapStatus.requesting_descriptors=Elosztási adatok lekérdezése
torlauncher.bootstrapStatus.loading_descriptors=Elosztási adatok betöltése
-torlauncher.bootstrapStatus.conn_or=Kapcsolódás a Tor hálózathoz
-torlauncher.bootstrapStatus.handshake_or=Tor kapcsolat felépítése
torlauncher.bootstrapStatus.done=Kapcsolódva a Tor hálózathoz!
torlauncher.bootstrapWarning.done=kész
diff --git a/src/chrome/locale/hy-AM/torlauncher.properties b/src/chrome/locale/hy-AM/torlauncher.properties
index fc5a3b9..d352808 100644
--- a/src/chrome/locale/hy-AM/torlauncher.properties
+++ b/src/chrome/locale/hy-AM/torlauncher.properties
@@ -39,15 +39,12 @@ torlauncher.forAssistance=Օգնության համար կապվեք %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Միացում Tor ցանցին
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/hy/torlauncher.properties b/src/chrome/locale/hy/torlauncher.properties
index 8dba0a7..fac6339 100644
--- a/src/chrome/locale/hy/torlauncher.properties
+++ b/src/chrome/locale/hy/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ia/torlauncher.properties b/src/chrome/locale/ia/torlauncher.properties
index b20f152..7bfad23 100644
--- a/src/chrome/locale/ia/torlauncher.properties
+++ b/src/chrome/locale/ia/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=facite
diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties
index 05af3de..ea8644e 100644
--- a/src/chrome/locale/id/torlauncher.properties
+++ b/src/chrome/locale/id/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Untuk bantuan, kunjungi %S
torlauncher.copiedNLogMessages=Penyalinan selesai. %S log pesan Tor telah siap untuk ditempelkan ke dalam editor text atau pesan email.
-torlauncher.bootstrapStatus.conn_dir=Menghubungkan ke direktori relay
-torlauncher.bootstrapStatus.handshake_dir=Membuat koneksi direktori terenkripsi
+torlauncher.bootstrapStatus.onehop_create=Membuat koneksi direktori terenkripsi
torlauncher.bootstrapStatus.requesting_status=Mengambil status jaringan
torlauncher.bootstrapStatus.loading_status=Memuat status jaringan
torlauncher.bootstrapStatus.loading_keys=Memuat sertifikat otoritas
torlauncher.bootstrapStatus.requesting_descriptors=Meminta informasi relay
torlauncher.bootstrapStatus.loading_descriptors=Memuat informasi relay
-torlauncher.bootstrapStatus.conn_or=Menghubungkan ke jaringan Tor
-torlauncher.bootstrapStatus.handshake_or=Membuat sirkuit Tor
torlauncher.bootstrapStatus.done=Telah terhubung ke jaringan Tor
torlauncher.bootstrapWarning.done=selesai
diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties
index 1e51efd..d10f91a 100644
--- a/src/chrome/locale/is/torlauncher.properties
+++ b/src/chrome/locale/is/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Til að fá hjálp, heimsæktu %S
torlauncher.copiedNLogMessages=Afritun lokið. %S færslur úr Tor-atvikaskrá eru tilbúnar til að líma inn í textaritil eða tölvupóst.
-torlauncher.bootstrapStatus.conn_dir=Tengist við yfirlitsskrá um endurvarpa
-torlauncher.bootstrapStatus.handshake_dir=Kem á tengingu við dulritaða yfirlitsskrá
+torlauncher.bootstrapStatus.onehop_create=Kem á tengingu við dulritaða yfirlitsskrá
torlauncher.bootstrapStatus.requesting_status=Næ í stöðu netkerfis
torlauncher.bootstrapStatus.loading_status=Hleð inn stöðu netkerfis
torlauncher.bootstrapStatus.loading_keys=Hleð inn skilríkjum vottunarstöðvar
torlauncher.bootstrapStatus.requesting_descriptors=Bið um upplýsingar endurvarpa
torlauncher.bootstrapStatus.loading_descriptors=Hleð inn upplýsingum endurvarpa
-torlauncher.bootstrapStatus.conn_or=Tengist Tor-netinu
-torlauncher.bootstrapStatus.handshake_or=Kem á Tor-rás
torlauncher.bootstrapStatus.done=Tengdur við Tor-netið!
torlauncher.bootstrapWarning.done=búið
diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties
index 7c62bd1..595497c 100644
--- a/src/chrome/locale/it/torlauncher.properties
+++ b/src/chrome/locale/it/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Per assistenza, visita %S
torlauncher.copiedNLogMessages=Copia completata. %S Messaggi di log Tor sono pronti per essere incollato in un editor di testo o un messaggio e-mail.
-torlauncher.bootstrapStatus.conn_dir=Connessione ad una directory dei relay
-torlauncher.bootstrapStatus.handshake_dir=Sto creando una connessione cifrata alla directory
+torlauncher.bootstrapStatus.onehop_create=Sto creando una connessione cifrata alla directory
torlauncher.bootstrapStatus.requesting_status=Sto ottenendo informazioni sullo stato della rete
torlauncher.bootstrapStatus.loading_status=Caricamento dello stato della rete
torlauncher.bootstrapStatus.loading_keys=Caricamento dei certificati delle authority
torlauncher.bootstrapStatus.requesting_descriptors=Richiesta di informazioni sui relay
torlauncher.bootstrapStatus.loading_descriptors=Caricamento delle informazioni sui relay
-torlauncher.bootstrapStatus.conn_or=Connessione in corso alla rete Tor
-torlauncher.bootstrapStatus.handshake_or=Sto creando un circuito Tor
torlauncher.bootstrapStatus.done=Connesso alla rete Tor!
torlauncher.bootstrapWarning.done=fatto
diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties
index b55a4df..afa41a2 100644
--- a/src/chrome/locale/ja/torlauncher.properties
+++ b/src/chrome/locale/ja/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=サポートについては、%Sをご覧ください
torlauncher.copiedNLogMessages=コピー成功。 %S個のTorログファイルがテキストエディターやEメールにペーストする準備ができました。
-torlauncher.bootstrapStatus.conn_dir=リレーディレクトリへ接続中
-torlauncher.bootstrapStatus.handshake_dir=暗号化されたディレクトリとの接続を確立中
+torlauncher.bootstrapStatus.onehop_create=暗号化されたディレクトリとの接続を確立中
torlauncher.bootstrapStatus.requesting_status=ネットワークを検索中
torlauncher.bootstrapStatus.loading_status=ネットワークを読込中
torlauncher.bootstrapStatus.loading_keys=認証局の署名を読込中
torlauncher.bootstrapStatus.requesting_descriptors=リレー情報を要求中
torlauncher.bootstrapStatus.loading_descriptors=リレー情報を読込中
-torlauncher.bootstrapStatus.conn_or=Torネットワークに接続しています
-torlauncher.bootstrapStatus.handshake_or=Tor回線を設置しています
torlauncher.bootstrapStatus.done=Torネットワークに接続しました!
torlauncher.bootstrapWarning.done=完了
diff --git a/src/chrome/locale/jv/torlauncher.properties b/src/chrome/locale/jv/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/jv/torlauncher.properties
+++ b/src/chrome/locale/jv/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties
index 457c46f..9701026 100644
--- a/src/chrome/locale/ka/torlauncher.properties
+++ b/src/chrome/locale/ka/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=დახმარებისთვის ეწვ
torlauncher.copiedNLogMessages=ასლის აღება დასრულებულია. %S Tor-ის აღრიცხვის ჩანაწერები მზადაა ტექსტურ რედაქტორში ან ელფოსტის წერილში ჩასასმელად.
-torlauncher.bootstrapStatus.conn_dir=გადამცემთა ცნობართან დაკავშირება
-torlauncher.bootstrapStatus.handshake_dir=დაშიფრული კავშირის დამყარება ცნობართან
+torlauncher.bootstrapStatus.onehop_create=დაშიფრული კავშირის დამყარება ცნობართან
torlauncher.bootstrapStatus.requesting_status=ქსელის მდგომარეობის დადგენა
torlauncher.bootstrapStatus.loading_status=ქსელის მდგომარეობის ჩატვირთვა
torlauncher.bootstrapStatus.loading_keys=უფლებამოსილი სერტიფიკატების ჩატვირთვა
torlauncher.bootstrapStatus.requesting_descriptors=გადამცემის მონაცემების მოთხოვნა
torlauncher.bootstrapStatus.loading_descriptors=გადამცემის მონაცემების ჩატვირთვა
-torlauncher.bootstrapStatus.conn_or=უკავშირდება Tor-ქსელს
-torlauncher.bootstrapStatus.handshake_or=Tor-ის კავშირის წრედის დამყარება
torlauncher.bootstrapStatus.done=Tor-ქსელთან დაკავშირებულია!
torlauncher.bootstrapWarning.done=მზადაა
diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties
index 4588663..d083a2b 100644
--- a/src/chrome/locale/kk/torlauncher.properties
+++ b/src/chrome/locale/kk/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/km/torlauncher.properties b/src/chrome/locale/km/torlauncher.properties
index 70aa687..6e4c0da 100644
--- a/src/chrome/locale/km/torlauncher.properties
+++ b/src/chrome/locale/km/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=តភ្ជាប់ទៅថតការបញ្ជូនបន្ត
-torlauncher.bootstrapStatus.handshake_dir=បង្កើតការតភ្ជាប់ថតដែលបានអ៊ិនគ្រីប
+torlauncher.bootstrapStatus.onehop_create=បង្កើតការតភ្ជាប់ថតដែលបានអ៊ិនគ្រីប
torlauncher.bootstrapStatus.requesting_status=ទៅយកស្ថានភាពបណ្ដាញ
torlauncher.bootstrapStatus.loading_status=ការផ្ទុកស្ថានភាពបណ្ដាញ
torlauncher.bootstrapStatus.loading_keys=ផ្ទុកប្រភពវិញ្ញាបនបត្រ
torlauncher.bootstrapStatus.requesting_descriptors=ស្នើព័ត៌មានការបញ្ជូនបន្ត
torlauncher.bootstrapStatus.loading_descriptors=ផ្ទុកព័ត៌មានការបញ្ជូនបន្ត
-torlauncher.bootstrapStatus.conn_or=ភ្ជាប់ទៅបណ្ដាញ Tor
-torlauncher.bootstrapStatus.handshake_or=បង្កើតសៀគ្វី Tor
torlauncher.bootstrapStatus.done=បានតភ្ជាប់ទៅបណ្ដាញ Tor !
torlauncher.bootstrapWarning.done=រួចរាល់
diff --git a/src/chrome/locale/kn/torlauncher.properties b/src/chrome/locale/kn/torlauncher.properties
index e5d4623..15a3fc1 100644
--- a/src/chrome/locale/kn/torlauncher.properties
+++ b/src/chrome/locale/kn/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=ಟಾರ್ ಜಾಲಕ್ಕೆ ಸೇರಿಕೋತಾ ಇದೀವಿ.
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ko-KR/torlauncher.properties b/src/chrome/locale/ko-KR/torlauncher.properties
index 22e9ffd..a513276 100644
--- a/src/chrome/locale/ko-KR/torlauncher.properties
+++ b/src/chrome/locale/ko-KR/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=중계소 경로에 연결하고 있어요
-torlauncher.bootstrapStatus.handshake_dir=경로와의 연결을 암호화해서 만들고 있어요
+torlauncher.bootstrapStatus.onehop_create=경로와의 연결을 암호화해서 만들고 있어요
torlauncher.bootstrapStatus.requesting_status=네트워크 상태를 알아오고 있어요
torlauncher.bootstrapStatus.loading_status=네트워크 상태를 불러오고 있어요
torlauncher.bootstrapStatus.loading_keys=인증서를 불러오고 있어요
torlauncher.bootstrapStatus.requesting_descriptors=중계소 정보를 요청하고 있어요
torlauncher.bootstrapStatus.loading_descriptors=중계소 정보를 불러오고 있어요
-torlauncher.bootstrapStatus.conn_or=Tor 네트워크로 연결하고 있어요
-torlauncher.bootstrapStatus.handshake_or=Tor 회선을 만들고 있어요
torlauncher.bootstrapStatus.done=Tor 네트워크에 연결되었어요!
torlauncher.bootstrapWarning.done=완료
diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties
index a8fcffc..8936d7f 100644
--- a/src/chrome/locale/ko/torlauncher.properties
+++ b/src/chrome/locale/ko/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=도움이 필요하면 %S를 방문하십시오.
torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기 나 이메일 메시지에 붙여 넣을 수 있는 상태가 됩니다.
-torlauncher.bootstrapStatus.conn_dir=중계서버 디렉토리에 연결
-torlauncher.bootstrapStatus.handshake_dir=암호화된 디렉터리 연결을 설정
+torlauncher.bootstrapStatus.onehop_create=암호화된 디렉터리 연결을 설정
torlauncher.bootstrapStatus.requesting_status=네트워크의 상태를 가져오는중
torlauncher.bootstrapStatus.loading_status=네트워크의 상태를 요청중
torlauncher.bootstrapStatus.loading_keys=권한 인증서를 로딩중
torlauncher.bootstrapStatus.requesting_descriptors=중계서버 정보를 요청중
torlauncher.bootstrapStatus.loading_descriptors=중계서버 정보를 로딩중
-torlauncher.bootstrapStatus.conn_or=Tor 네트워크에 연결중
-torlauncher.bootstrapStatus.handshake_or=토르 서킷의 연결을 성공
torlauncher.bootstrapStatus.done=Tor 네트워크에 연결 성공!
torlauncher.bootstrapWarning.done=완료
diff --git a/src/chrome/locale/ku/torlauncher.properties b/src/chrome/locale/ku/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/ku/torlauncher.properties
+++ b/src/chrome/locale/ku/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/kw/torlauncher.properties b/src/chrome/locale/kw/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/kw/torlauncher.properties
+++ b/src/chrome/locale/kw/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ky/torlauncher.properties b/src/chrome/locale/ky/torlauncher.properties
index b489a96..8eb0673 100644
--- a/src/chrome/locale/ky/torlauncher.properties
+++ b/src/chrome/locale/ky/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Tor тармагына туташтырылып турат!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties
index 584a9ee..ed7f880 100644
--- a/src/chrome/locale/lb/torlauncher.properties
+++ b/src/chrome/locale/lb/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/lg/torlauncher.properties b/src/chrome/locale/lg/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/lg/torlauncher.properties
+++ b/src/chrome/locale/lg/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ln/torlauncher.properties b/src/chrome/locale/ln/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/ln/torlauncher.properties
+++ b/src/chrome/locale/ln/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties
index 92d8d3a..6468d8c 100644
--- a/src/chrome/locale/lo/torlauncher.properties
+++ b/src/chrome/locale/lo/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=ກຳລັງເຊື່ອມຕໍ່ເຂົ້າກັບເຄືອຂ່າຍ Tor
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties
index 963d5cf..129fbed 100644
--- a/src/chrome/locale/lt/torlauncher.properties
+++ b/src/chrome/locale/lt/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Norėdami gauti pagalbos, apsilankykite %S
torlauncher.copiedNLogMessages=Kopijavimas atliktas. %S Tor įvykių žurnalas paruoštas įklijuoti į teksto redagavimo programą ar elektroninio pašto pranešimą.
-torlauncher.bootstrapStatus.conn_dir=Jungiamasi prie retransliavimo katalogo
-torlauncher.bootstrapStatus.handshake_dir=Užmezgiamas ryšys
+torlauncher.bootstrapStatus.onehop_create=Užmezgiamas ryšys
torlauncher.bootstrapStatus.requesting_status=Nuskaitoma tinklo būklė
torlauncher.bootstrapStatus.loading_status=Įkeliama tinklo būklė
torlauncher.bootstrapStatus.loading_keys=Įkeliami liudijimų įstaigos liudijimai
torlauncher.bootstrapStatus.requesting_descriptors=Užklausiama retransliavimo informacija
torlauncher.bootstrapStatus.loading_descriptors=Įkeliama retransliavimo informacija
-torlauncher.bootstrapStatus.conn_or=Jungiamasi prie Tor tinklo
-torlauncher.bootstrapStatus.handshake_or=Užmezgiamas sujungimas
torlauncher.bootstrapStatus.done=Prisijungta prie Tor tinklo!
torlauncher.bootstrapWarning.done=atlikta
diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties
index 52fcefe..35f26d3 100644
--- a/src/chrome/locale/lv/torlauncher.properties
+++ b/src/chrome/locale/lv/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Lai saņemtu palīdzību, apmeklējiet %S
torlauncher.copiedNLogMessages=Kopēšana paveikta. %S Tor žurnāla ziņojumi sagatavoti ielīmēšanai teksta redaktorā vai e-pasta ziņojumā.
-torlauncher.bootstrapStatus.conn_dir=Veido savienojumu ar retranslatoru direktoriju
-torlauncher.bootstrapStatus.handshake_dir=Izveido šifrētu savienojumu ar direktoriju
+torlauncher.bootstrapStatus.onehop_create=Izveido šifrētu savienojumu ar direktoriju
torlauncher.bootstrapStatus.requesting_status=Izgūst tīkla statusu
torlauncher.bootstrapStatus.loading_status=Ielādē tīkla statusu
torlauncher.bootstrapStatus.loading_keys=Ielādē sertificēšanas sertifikātus
torlauncher.bootstrapStatus.requesting_descriptors=Pieprasa retranslatoru informāciju
torlauncher.bootstrapStatus.loading_descriptors=Ielādē retranslatoru informāciju
-torlauncher.bootstrapStatus.conn_or=Veido savienojumu ar Tor'a tīklu
-torlauncher.bootstrapStatus.handshake_or=Izveido Tor maršrutu
torlauncher.bootstrapStatus.done=Savienojums ar tīklu Tor izveidots!
torlauncher.bootstrapWarning.done=gatavs
diff --git a/src/chrome/locale/mg/torlauncher.properties b/src/chrome/locale/mg/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/mg/torlauncher.properties
+++ b/src/chrome/locale/mg/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/mi/torlauncher.properties b/src/chrome/locale/mi/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/mi/torlauncher.properties
+++ b/src/chrome/locale/mi/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties
index 8dfecbb..505510a 100644
--- a/src/chrome/locale/mk/torlauncher.properties
+++ b/src/chrome/locale/mk/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=За помош, посетете %S
torlauncher.copiedNLogMessages=Копирањето е завршено. %S Tor лог пораките се подготвени да бидат залепени во уредувач на текст или во порака за е-пошта.
-torlauncher.bootstrapStatus.conn_dir=Поврзување на реле директориум
-torlauncher.bootstrapStatus.handshake_dir=Воспоставување енкриптирано поврзување со директориумот
+torlauncher.bootstrapStatus.onehop_create=Воспоставување енкриптирано поврзување со директориумот
torlauncher.bootstrapStatus.requesting_status=Добивање на мрежен статус
torlauncher.bootstrapStatus.loading_status=Вчитување на мрежен статус
torlauncher.bootstrapStatus.loading_keys=Вчитување на авторитетни сертификати
torlauncher.bootstrapStatus.requesting_descriptors=Барање на информации за реле
torlauncher.bootstrapStatus.loading_descriptors=Вчитување на информации за реле
-torlauncher.bootstrapStatus.conn_or=Поврзување на Tor мрежата
-torlauncher.bootstrapStatus.handshake_or=Воспоставување на Tor круг
torlauncher.bootstrapStatus.done=Поврзани сте на Tor мрежата!
torlauncher.bootstrapWarning.done=завршено
diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties
index 84fd819..ce5215a 100644
--- a/src/chrome/locale/ml/torlauncher.properties
+++ b/src/chrome/locale/ml/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/mn/torlauncher.properties b/src/chrome/locale/mn/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/mn/torlauncher.properties
+++ b/src/chrome/locale/mn/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties
index 8d8494a..54121ff 100644
--- a/src/chrome/locale/mr/torlauncher.properties
+++ b/src/chrome/locale/mr/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=टॉर जाळ्याला जोडणी करणे चालू आहे
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties
index 1976a17..e3f5618 100644
--- a/src/chrome/locale/ms-MY/torlauncher.properties
+++ b/src/chrome/locale/ms-MY/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Untuk dapatkan bantuan, lawati %S
torlauncher.copiedNLogMessages=Salin selesai. %S mesej log Tor sedia ditampal ke dalam penyunting teks atau mesej emel.
-torlauncher.bootstrapStatus.conn_dir=Menyambung dengan direktori geganti
-torlauncher.bootstrapStatus.handshake_dir=Menjalinkan sambungan direktori tersulit
+torlauncher.bootstrapStatus.onehop_create=Menjalinkan sambungan direktori tersulit
torlauncher.bootstrapStatus.requesting_status=Memperoleh status rangkaian
torlauncher.bootstrapStatus.loading_status=Memuatkan status rangkaian
torlauncher.bootstrapStatus.loading_keys=Memuatkan sijil kuasa
torlauncher.bootstrapStatus.requesting_descriptors=Meminta maklumat geganti
torlauncher.bootstrapStatus.loading_descriptors=Memuatkan maklumat geganti
-torlauncher.bootstrapStatus.conn_or=Menyambung ke rangkaian Tor
-torlauncher.bootstrapStatus.handshake_or=Menjalinkan litar Tor
torlauncher.bootstrapStatus.done=Bersambung dengan rangkaian Tor!
torlauncher.bootstrapWarning.done=selesai
diff --git a/src/chrome/locale/mt/torlauncher.properties b/src/chrome/locale/mt/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/mt/torlauncher.properties
+++ b/src/chrome/locale/mt/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties
index a14b55c..36769b0 100644
--- a/src/chrome/locale/my/torlauncher.properties
+++ b/src/chrome/locale/my/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Relay ဖိုင်လမ်းကြောင်း တစ်ခုကို ဆက်သွယ်နေသည်
-torlauncher.bootstrapStatus.handshake_dir=စာဝှက်ထားသည့် ဖိုင်လမ်းကြောင်း ချိတ်ဆက်မှု တစ်ခု တည်ဆောက်နေသည်
+torlauncher.bootstrapStatus.onehop_create=စာဝှက်ထားသည့် ဖိုင်လမ်းကြောင်း ချိတ်ဆက်မှု တစ်ခု တည်ဆောက်နေသည်
torlauncher.bootstrapStatus.requesting_status=ကွန်ရက် အနေအထားကို ပြန်ရယူနေသည်
torlauncher.bootstrapStatus.loading_status=ကွန်ရက် အနေအထားကို ဖွင့်နေသည်
torlauncher.bootstrapStatus.loading_keys=လုပ်ပိုင်ခွင့် လက်မှတ်များကို ရယူနေသည်
torlauncher.bootstrapStatus.requesting_descriptors=Relay အချက်အလက်ကို တောင်းခံနေသည်
torlauncher.bootstrapStatus.loading_descriptors=Relay အချက်အလက်များကို ရယူနေသည်
-torlauncher.bootstrapStatus.conn_or=Tor ကွန်ရက်ကို ဆက်သွယ်နေသည်
-torlauncher.bootstrapStatus.handshake_or=Tor ဆားကစ် တစ်ခုကို တည်ဆောက်နေသည်
torlauncher.bootstrapStatus.done=Tor ကွန်ရက်ကို ချိတ်ဆက်မိသည်!
torlauncher.bootstrapWarning.done=ပြီးသွားပြီ
diff --git a/src/chrome/locale/nah/torlauncher.properties b/src/chrome/locale/nah/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/nah/torlauncher.properties
+++ b/src/chrome/locale/nah/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/nap/torlauncher.properties b/src/chrome/locale/nap/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/nap/torlauncher.properties
+++ b/src/chrome/locale/nap/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties
index 442cc59..6b5fae0 100644
--- a/src/chrome/locale/nb/torlauncher.properties
+++ b/src/chrome/locale/nb/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For hjelp, besøk %S
torlauncher.copiedNLogMessages=Kopiering ferdig. %S Loggføringsmeldinger fra Tor er klare til å bli sent til et skriveprogram eller en e-post.
-torlauncher.bootstrapStatus.conn_dir=Kobler til en rutingsstafettoppsetts-katalog
-torlauncher.bootstrapStatus.handshake_dir=Etablerer en kryptert katalogforbindelse
+torlauncher.bootstrapStatus.onehop_create=Etablerer en kryptert katalogforbindelse
torlauncher.bootstrapStatus.requesting_status=Mottar nettverkstatus
torlauncher.bootstrapStatus.loading_status=Laster nettverkstatus
torlauncher.bootstrapStatus.loading_keys=Laster identitetsbekreftende sertifikater
torlauncher.bootstrapStatus.requesting_descriptors=Sender forespørsel om rutingsstafettoppsettsinformasjon
torlauncher.bootstrapStatus.loading_descriptors=Laster inn rutingsstafettoppsetts-informasjon
-torlauncher.bootstrapStatus.conn_or=Kobler til Tor-nettverket
-torlauncher.bootstrapStatus.handshake_or=Etablerer en Tor-krets
torlauncher.bootstrapStatus.done=Koblet til Tor-nettverket!
torlauncher.bootstrapWarning.done=ferdig
diff --git a/src/chrome/locale/nds/torlauncher.properties b/src/chrome/locale/nds/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/nds/torlauncher.properties
+++ b/src/chrome/locale/nds/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ne/torlauncher.properties b/src/chrome/locale/ne/torlauncher.properties
index ca42a24..37fa3c0 100644
--- a/src/chrome/locale/ne/torlauncher.properties
+++ b/src/chrome/locale/ne/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties
index c2c146b..816fceb 100644
--- a/src/chrome/locale/nl-BE/torlauncher.properties
+++ b/src/chrome/locale/nl-BE/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Netwerkstatus aan het ophalen
torlauncher.bootstrapStatus.loading_status=Netwerkstatus aan het lasen
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecteren naar het Tor netwerk
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=klaar
diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties
index 48557bb..9299ab2 100644
--- a/src/chrome/locale/nl/torlauncher.properties
+++ b/src/chrome/locale/nl/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Voor bijstand, bezoek %S
torlauncher.copiedNLogMessages=Kopiëren klaar. %S Tor logberichten zijn klaar om in een teksteditor of een e-mailbericht te worden geplakt.
-torlauncher.bootstrapStatus.conn_dir=Verbinden met een relay directory
-torlauncher.bootstrapStatus.handshake_dir=Maken van een versleutelde verbinding met de lijst
+torlauncher.bootstrapStatus.onehop_create=Maken van een versleutelde verbinding met de lijst
torlauncher.bootstrapStatus.requesting_status=Ontvangen van de netwerkstatus
torlauncher.bootstrapStatus.loading_status=Laden van de netwerkstatus
torlauncher.bootstrapStatus.loading_keys=Laden van de authoriteitcertificaten
torlauncher.bootstrapStatus.requesting_descriptors=Opvragen van verbindingsinformatie
torlauncher.bootstrapStatus.loading_descriptors=Laden van verbindingsinformatie
-torlauncher.bootstrapStatus.conn_or=Bezig met verbinden met het Tor-netwerk
-torlauncher.bootstrapStatus.handshake_or=Maken van een Tor circuit
torlauncher.bootstrapStatus.done=Verbonden met het Tor-netwerk!
torlauncher.bootstrapWarning.done=uitgevoerd
diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn/torlauncher.properties
index 0a0d105..15ef22f 100644
--- a/src/chrome/locale/nn/torlauncher.properties
+++ b/src/chrome/locale/nn/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Hentar nettverksstatus
torlauncher.bootstrapStatus.loading_status=Lastar nettverkstatus
torlauncher.bootstrapStatus.loading_keys=Lastar autoritetssertifikat
torlauncher.bootstrapStatus.requesting_descriptors=Ber om relae-informasjon
torlauncher.bootstrapStatus.loading_descriptors=Lastar relae-informasjon
-torlauncher.bootstrapStatus.conn_or=Koplar til Tor-nettverket
-torlauncher.bootstrapStatus.handshake_or=Opprettar ein Tor-krets
torlauncher.bootstrapStatus.done=Kopla til Tor-nettverket!
torlauncher.bootstrapWarning.done=ferdig
diff --git a/src/chrome/locale/nso/torlauncher.properties b/src/chrome/locale/nso/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/nso/torlauncher.properties
+++ b/src/chrome/locale/nso/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/oc/torlauncher.properties b/src/chrome/locale/oc/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/oc/torlauncher.properties
+++ b/src/chrome/locale/oc/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/or/torlauncher.properties b/src/chrome/locale/or/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/or/torlauncher.properties
+++ b/src/chrome/locale/or/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties
index 893db3c..6d99d6b 100644
--- a/src/chrome/locale/pa/torlauncher.properties
+++ b/src/chrome/locale/pa/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=ਸਹਾਇਤਾ ਲਈ ਜਾਓ %S ਉੱਪਰ
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=ਨੈੱਟਵਰਕ ਸਥਿਤੀ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ
torlauncher.bootstrapStatus.loading_status=ਨੈੱਟਵਰਕ ਸਥਇਤੀ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=ਮੁਕੰਮਲ
diff --git a/src/chrome/locale/pap/torlauncher.properties b/src/chrome/locale/pap/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/pap/torlauncher.properties
+++ b/src/chrome/locale/pap/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties
index 32b912a..384c66d 100644
--- a/src/chrome/locale/pl/torlauncher.properties
+++ b/src/chrome/locale/pl/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Aby uzyskać pomoc, odwiedź %S
torlauncher.copiedNLogMessages=Kopia zakończona. %S logi Tora są gotowe do wklejenia do notatnika lub wiadomości email.
-torlauncher.bootstrapStatus.conn_dir=Podłączanie do katalogu węzłów
-torlauncher.bootstrapStatus.handshake_dir=Ustanawianie szyfrowanego połączenia z katalogiem
+torlauncher.bootstrapStatus.onehop_create=Ustanawianie szyfrowanego połączenia z katalogiem
torlauncher.bootstrapStatus.requesting_status=Odczytywanie stanu sieci
torlauncher.bootstrapStatus.loading_status=Wczytywanie stanu sieci
torlauncher.bootstrapStatus.loading_keys=Wczytywanie certyfikatów uwierzytelnienia
torlauncher.bootstrapStatus.requesting_descriptors=Żądanie informacji o węźle
torlauncher.bootstrapStatus.loading_descriptors=Wczytywanie informacji o węźle
-torlauncher.bootstrapStatus.conn_or=Łączenie z siecią Tor
-torlauncher.bootstrapStatus.handshake_or=Ustanawianie ścieżki Tora
torlauncher.bootstrapStatus.done=Połączony z siecią Tor!
torlauncher.bootstrapWarning.done=zrobione
diff --git a/src/chrome/locale/pms/torlauncher.properties b/src/chrome/locale/pms/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/pms/torlauncher.properties
+++ b/src/chrome/locale/pms/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ps/torlauncher.properties b/src/chrome/locale/ps/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/ps/torlauncher.properties
+++ b/src/chrome/locale/ps/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties
index 21d0106..786d2bc 100644
--- a/src/chrome/locale/pt-BR/torlauncher.properties
+++ b/src/chrome/locale/pt-BR/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Se você precisar de assistência, por favor visite %
torlauncher.copiedNLogMessages=Cópia concluída. As mensagens %S do Tor log estão prontas para ser copiadas em um editor de texto ou em uma mensagem de e-mail.
-torlauncher.bootstrapStatus.conn_dir=Conectando a um diretório de retransmissores
-torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de diretório criptografado
+torlauncher.bootstrapStatus.onehop_create=Estabelecendo uma conexão de diretório criptografado
torlauncher.bootstrapStatus.requesting_status=Recebendo estado da rede
torlauncher.bootstrapStatus.loading_status=Carregando estado da rede
torlauncher.bootstrapStatus.loading_keys=Carregando certificados de autoridade
torlauncher.bootstrapStatus.requesting_descriptors=Requisitando informações do retransmissor
torlauncher.bootstrapStatus.loading_descriptors=Carregando informações do retransmissor
-torlauncher.bootstrapStatus.conn_or=Conectando à rede Tor
-torlauncher.bootstrapStatus.handshake_or=Estabelecendo um circuito Tor
torlauncher.bootstrapStatus.done=Conectado à rede Tor!
torlauncher.bootstrapWarning.done=pronto
diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties
index dd89633..01e80f0 100644
--- a/src/chrome/locale/pt/torlauncher.properties
+++ b/src/chrome/locale/pt/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Para assistência, visite %S
torlauncher.copiedNLogMessages=Cópia completa. Estão prontas %S mensagens do registo de eventos do Tor para serem coladas num editor de texto ou numa mensagem de correio eletrónico.
-torlauncher.bootstrapStatus.conn_dir=A ligar à diretoria do retransmissor
-torlauncher.bootstrapStatus.handshake_dir=A estabelecer uma ligação de diretoria encriptada
+torlauncher.bootstrapStatus.onehop_create=A estabelecer uma ligação de diretoria encriptada
torlauncher.bootstrapStatus.requesting_status=A obter o estado da rede
torlauncher.bootstrapStatus.loading_status=A carregar o estado da rede
torlauncher.bootstrapStatus.loading_keys=A carregar os certificados de autoridade
torlauncher.bootstrapStatus.requesting_descriptors=A solicitar a informação do retransmissor
torlauncher.bootstrapStatus.loading_descriptors=A carregar a informação do retransmissor
-torlauncher.bootstrapStatus.conn_or=A ligar à rede Tor
-torlauncher.bootstrapStatus.handshake_or=A estabelecer um circuito Tor
torlauncher.bootstrapStatus.done=Ligado à rede Tor
torlauncher.bootstrapWarning.done=finalizado
diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties
index 6ec6f26..f8efe95 100644
--- a/src/chrome/locale/ro/torlauncher.properties
+++ b/src/chrome/locale/ro/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Pentru asistenţă, vizitează %S
torlauncher.copiedNLogMessages=Copiere efectuată. %S Mesajele de log Tor sunt gata pentru a fi lipite într-un editor de text sau un mesaj e-mail.
-torlauncher.bootstrapStatus.conn_dir=Conectare la un director relay
-torlauncher.bootstrapStatus.handshake_dir=Se stabileşte o conexiune criptată la director
+torlauncher.bootstrapStatus.onehop_create=Se stabileşte o conexiune criptată la director
torlauncher.bootstrapStatus.requesting_status=Se obţin informaţii despre starea reţelei
torlauncher.bootstrapStatus.loading_status=Se încarcă informaţiile despre starea reţelei
torlauncher.bootstrapStatus.loading_keys=Se încarcă certificatele de autoritate
torlauncher.bootstrapStatus.requesting_descriptors=Se cer informaţii despre relay
torlauncher.bootstrapStatus.loading_descriptors=Se încarcă informaţiile despre relay
-torlauncher.bootstrapStatus.conn_or=Conctare la reţeaua Tor
-torlauncher.bootstrapStatus.handshake_or=Se stabileşte un circuit Tor
torlauncher.bootstrapStatus.done=Conectare efectuată cu succes!
torlauncher.bootstrapWarning.done=efectuat
diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties
index 7f978da..54996ef 100644
--- a/src/chrome/locale/ru/torlauncher.properties
+++ b/src/chrome/locale/ru/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Посетите %S, чтобы получить по
torlauncher.copiedNLogMessages=Копирование завершено. %S собщение с логами Tor находятся в буфере обмена и могут быть вставлены в текстовый редактор или email.
-torlauncher.bootstrapStatus.conn_dir=Подключение к каталогy ретрансляторов
-torlauncher.bootstrapStatus.handshake_dir=Создание шифрованного соединения каталогa
+torlauncher.bootstrapStatus.onehop_create=Создание шифрованного соединения каталогa
torlauncher.bootstrapStatus.requesting_status=Получение статуса сети
torlauncher.bootstrapStatus.loading_status=Загрузка состояния сети
torlauncher.bootstrapStatus.loading_keys=Загрузка сертификатов
torlauncher.bootstrapStatus.requesting_descriptors=Запрос информации ретранслятора
torlauncher.bootstrapStatus.loading_descriptors=Загрузка информации ретранслятора
-torlauncher.bootstrapStatus.conn_or=Подключение к сети Tor
-torlauncher.bootstrapStatus.handshake_or=Создание цепочки Tor
torlauncher.bootstrapStatus.done=Подключен к сети Tor!
torlauncher.bootstrapWarning.done=cделано
diff --git a/src/chrome/locale/ru(a)petr1708/torlauncher.properties b/src/chrome/locale/ru(a)petr1708/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/ru(a)petr1708/torlauncher.properties
+++ b/src/chrome/locale/ru(a)petr1708/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/sco/torlauncher.properties b/src/chrome/locale/sco/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/sco/torlauncher.properties
+++ b/src/chrome/locale/sco/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/si-LK/torlauncher.properties b/src/chrome/locale/si-LK/torlauncher.properties
index dc59f62..f0d81b7 100644
--- a/src/chrome/locale/si-LK/torlauncher.properties
+++ b/src/chrome/locale/si-LK/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=ප්රතියෝජක ඩිරෙක්ටරියකට සබදෙමින්
-torlauncher.bootstrapStatus.handshake_dir=සංකේත කරන ලද ඩිරෙක්ටරි සබැදුමක් ස්ථාපනය කරමින්
+torlauncher.bootstrapStatus.onehop_create=සංකේත කරන ලද ඩිරෙක්ටරි සබැදුමක් ස්ථාපනය කරමින්
torlauncher.bootstrapStatus.requesting_status=ජාල තත්වය සමුධ්රණය කරමින්
torlauncher.bootstrapStatus.loading_status=ජාල තත්වය ප්රවේශනය කරමින්
torlauncher.bootstrapStatus.loading_keys=අධිකාරීත්ව සහතික ප්රවේශනය කරමින්
torlauncher.bootstrapStatus.requesting_descriptors=ප්රතියෝජක තොරතුරු අයදුම් කරමින්
torlauncher.bootstrapStatus.loading_descriptors=ප්රතියෝජක තොරතුරු ප්රවේශනය කරමින්
-torlauncher.bootstrapStatus.conn_or=Tor ජාලය හා සම්බන්ධ වෙමින්
-torlauncher.bootstrapStatus.handshake_or=Tor පරිපථයක් ස්ථාපනය කරමින්
torlauncher.bootstrapStatus.done=Tor ජාලයට සබැදියි
torlauncher.bootstrapWarning.done=කරන ලදී
diff --git a/src/chrome/locale/sk-SK/torlauncher.properties b/src/chrome/locale/sk-SK/torlauncher.properties
index 2f77c46..26f6190 100644
--- a/src/chrome/locale/sk-SK/torlauncher.properties
+++ b/src/chrome/locale/sk-SK/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Pre pomoc navštívte %S
torlauncher.copiedNLogMessages=Kopírovanie kompletné. %S záznamov je pripravených na vloženie do textového editora alebo emailu.
-torlauncher.bootstrapStatus.conn_dir=Pripájam sa do priečinka relé
-torlauncher.bootstrapStatus.handshake_dir=Vytváram spojenie so zašifrovaným priečinkom
+torlauncher.bootstrapStatus.onehop_create=Vytváram spojenie so zašifrovaným priečinkom
torlauncher.bootstrapStatus.requesting_status=Získavam stav siete
torlauncher.bootstrapStatus.loading_status=Načítavam stav siete
torlauncher.bootstrapStatus.loading_keys=Načítavam certifikáty autority
torlauncher.bootstrapStatus.requesting_descriptors=Vyžiadavam informácie o relé
torlauncher.bootstrapStatus.loading_descriptors=Načítavam informácie o relé
-torlauncher.bootstrapStatus.conn_or=Pripájanie do siete Tor
-torlauncher.bootstrapStatus.handshake_or=Vytváram obvod Tor
torlauncher.bootstrapStatus.done=Pripojené do siete Tor!
torlauncher.bootstrapWarning.done=hotovo
diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties
index 79100f0..b37a631 100644
--- a/src/chrome/locale/sk/torlauncher.properties
+++ b/src/chrome/locale/sk/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Kopirovanie ukončené. %S Tor log správy je pripravené na prilepenie do textového editora alebo emailovej správy.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Načítanie stavu siete
torlauncher.bootstrapStatus.loading_keys=Nahrávanie autorizačných certifikátov
torlauncher.bootstrapStatus.requesting_descriptors=Požiadať o informácie o relay
torlauncher.bootstrapStatus.loading_descriptors=Načítať informácie o relay
-torlauncher.bootstrapStatus.conn_or=Pripájanie do siete Tor
-torlauncher.bootstrapStatus.handshake_or=Nastavuje sa Tor okruh
torlauncher.bootstrapStatus.done=Ste pripojený do siete Tor!
torlauncher.bootstrapWarning.done=hotovo
diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties
index bfbe535..947ddde 100644
--- a/src/chrome/locale/sl-SI/torlauncher.properties
+++ b/src/chrome/locale/sl-SI/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Kopiranje končano. % S Tor poročila so pripravljena za lepljenje v urejevalnik besedil ali e-poštno sporočilo.
-torlauncher.bootstrapStatus.conn_dir=Povezovanje na imenik vmesnika
-torlauncher.bootstrapStatus.handshake_dir=Urejanje šifriranega imenika povezave
+torlauncher.bootstrapStatus.onehop_create=Urejanje šifriranega imenika povezave
torlauncher.bootstrapStatus.requesting_status=Stanje vzpostavljenega omrežja
torlauncher.bootstrapStatus.loading_status=Stanje nalaganja omrežja
torlauncher.bootstrapStatus.loading_keys=Nalaganje veljavnosti certifikatov
torlauncher.bootstrapStatus.requesting_descriptors=Info zahtevanih vmesnikov
torlauncher.bootstrapStatus.loading_descriptors=Nalaganje informacij vmesnikov
-torlauncher.bootstrapStatus.conn_or=Povezovanje v Tor omrežje
-torlauncher.bootstrapStatus.handshake_or=Vzpostavljanje Tor povezave
torlauncher.bootstrapStatus.done=Povezan v Tor omrežje
torlauncher.bootstrapWarning.done=narejeno
diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties
index d8c7624..ebab3ff 100644
--- a/src/chrome/locale/sl/torlauncher.properties
+++ b/src/chrome/locale/sl/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Povezovanje v Tor omrežje
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/sn/torlauncher.properties b/src/chrome/locale/sn/torlauncher.properties
index 85bb97c..71b7fc0 100644
--- a/src/chrome/locale/sn/torlauncher.properties
+++ b/src/chrome/locale/sn/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/so/torlauncher.properties b/src/chrome/locale/so/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/so/torlauncher.properties
+++ b/src/chrome/locale/so/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/son/torlauncher.properties b/src/chrome/locale/son/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/son/torlauncher.properties
+++ b/src/chrome/locale/son/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/sq-AL/torlauncher.properties b/src/chrome/locale/sq-AL/torlauncher.properties
index 02be756..da5641e 100644
--- a/src/chrome/locale/sq-AL/torlauncher.properties
+++ b/src/chrome/locale/sq-AL/torlauncher.properties
@@ -39,15 +39,12 @@ torlauncher.forAssistance=For assistance, contact %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties
index bb461ef..b74eea0 100644
--- a/src/chrome/locale/sq/torlauncher.properties
+++ b/src/chrome/locale/sq/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Kopjimi u krye. Mesazhet e regjistrit të Tor për %S, janë gati për t'u ngjitur në një redaktues teksti, ose në një mesazh e-poste.
-torlauncher.bootstrapStatus.conn_dir=Lidhja me një direktori releje
-torlauncher.bootstrapStatus.handshake_dir=Krijimi i një lidhje me direktori të shifruar
+torlauncher.bootstrapStatus.onehop_create=Krijimi i një lidhje me direktori të shifruar
torlauncher.bootstrapStatus.requesting_status=Rigjetja e statusit të rrjetit
torlauncher.bootstrapStatus.loading_status=Ngarkimi i statusit të rrjetit
torlauncher.bootstrapStatus.loading_keys=Ngarkimi i certifikatave të autoritetit
torlauncher.bootstrapStatus.requesting_descriptors=Kërkimi i informacionit të relesë
torlauncher.bootstrapStatus.loading_descriptors=Ngarkimi i informacionit të relesë
-torlauncher.bootstrapStatus.conn_or=Të lidhesh me rrjetin Tor
-torlauncher.bootstrapStatus.handshake_or=Krijimi i një cirkuiti të Tor
torlauncher.bootstrapStatus.done=I lidhur me rrjetin e Tor!
torlauncher.bootstrapWarning.done=kryer
diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties
index 95448ee..228a80a 100644
--- a/src/chrome/locale/sr/torlauncher.properties
+++ b/src/chrome/locale/sr/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Копирање завршено. %S Top лог поруке су спремне да буду налепљене у уређивач текста или у поруку у електронској пошти.
-torlauncher.bootstrapStatus.conn_dir=Повезивање са релеј директоријумом
-torlauncher.bootstrapStatus.handshake_dir=Успостављање шифроване везе директоријума
+torlauncher.bootstrapStatus.onehop_create=Успостављање шифроване везе директоријума
torlauncher.bootstrapStatus.requesting_status=Преузимање мрежног статуса
torlauncher.bootstrapStatus.loading_status=Учитавање мрежног статуса
torlauncher.bootstrapStatus.loading_keys=Преузимање сертификата ауторитета
torlauncher.bootstrapStatus.requesting_descriptors=Захтев за пренос информације
torlauncher.bootstrapStatus.loading_descriptors=Учитавање преноса информације
-torlauncher.bootstrapStatus.conn_or=Повезивање на Тор мрежу
-torlauncher.bootstrapStatus.handshake_or=Успостављање Тор круга
torlauncher.bootstrapStatus.done=Повезан са Тор мрежом!
torlauncher.bootstrapWarning.done=ради
diff --git a/src/chrome/locale/sr(a)latin/torlauncher.properties b/src/chrome/locale/sr(a)latin/torlauncher.properties
index 6a75211..c6019c2 100644
--- a/src/chrome/locale/sr(a)latin/torlauncher.properties
+++ b/src/chrome/locale/sr(a)latin/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/st/torlauncher.properties b/src/chrome/locale/st/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/st/torlauncher.properties
+++ b/src/chrome/locale/st/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/su/torlauncher.properties b/src/chrome/locale/su/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/su/torlauncher.properties
+++ b/src/chrome/locale/su/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties
index 406dfb9..03dfa4d 100644
--- a/src/chrome/locale/sv/torlauncher.properties
+++ b/src/chrome/locale/sv/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=För hjälp, besök %S
torlauncher.copiedNLogMessages=Kopieringen är färdig. %S meddelanden från Tor-loggen som du kan klistra in i en textredigerare eller ett e-postmeddelande.
-torlauncher.bootstrapStatus.conn_dir=Ansluter till en reläkatalog
-torlauncher.bootstrapStatus.handshake_dir=Skapar en krypterad kataloganslutning
+torlauncher.bootstrapStatus.onehop_create=Skapar en krypterad kataloganslutning
torlauncher.bootstrapStatus.requesting_status=Hämtar nätverksstatus
torlauncher.bootstrapStatus.loading_status=Läser in nätverksstatus
torlauncher.bootstrapStatus.loading_keys=Läser in auktoritära certifikat
torlauncher.bootstrapStatus.requesting_descriptors=Begär reläinformation
torlauncher.bootstrapStatus.loading_descriptors=Läser in reläinformation
-torlauncher.bootstrapStatus.conn_or=Ansluter till Tor-nätverket
-torlauncher.bootstrapStatus.handshake_or=Etablerar en Tor-krets
torlauncher.bootstrapStatus.done=Ansluten till Tor-nätverket!
torlauncher.bootstrapWarning.done=klar
diff --git a/src/chrome/locale/sw/torlauncher.properties b/src/chrome/locale/sw/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/sw/torlauncher.properties
+++ b/src/chrome/locale/sw/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/szl/torlauncher.properties b/src/chrome/locale/szl/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/szl/torlauncher.properties
+++ b/src/chrome/locale/szl/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties
index 3bc8ce4..75cb7d1 100644
--- a/src/chrome/locale/ta/torlauncher.properties
+++ b/src/chrome/locale/ta/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Tor நெட்வொர்க்கிற்கு இணைக்கிறது
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/te-IN/torlauncher.properties b/src/chrome/locale/te-IN/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/te-IN/torlauncher.properties
+++ b/src/chrome/locale/te-IN/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties
index 209ac60..2902bc5 100644
--- a/src/chrome/locale/te/torlauncher.properties
+++ b/src/chrome/locale/te/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties
index bdc9b73..0014efd 100644
--- a/src/chrome/locale/tg/torlauncher.properties
+++ b/src/chrome/locale/tg/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties
index 5c2e2a2..bad1a68 100644
--- a/src/chrome/locale/th/torlauncher.properties
+++ b/src/chrome/locale/th/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=สำหรับความช่วยเหล
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=กำลังเชื่อมต่อกับ คลังเก็บรายชื่อ relay (relay directory)
-torlauncher.bootstrapStatus.handshake_dir=กำลังสร้างการเชื่อมต่อแบบเข้ารหัสกับคลังเก็บรายชื่อ
+torlauncher.bootstrapStatus.onehop_create=กำลังสร้างการเชื่อมต่อแบบเข้ารหัสกับคลังเก็บรายชื่อ
torlauncher.bootstrapStatus.requesting_status=กำลังตรวจสถานะเครือข่าย
torlauncher.bootstrapStatus.loading_status=กำลังดึงข้อมูลสถานะเครือข่าย
torlauncher.bootstrapStatus.loading_keys=กำลังดึง ใบรับรองการให้สิทธิ (authority certificates)
torlauncher.bootstrapStatus.requesting_descriptors=กำลังร้องขอข้อมูล relay
torlauncher.bootstrapStatus.loading_descriptors=กำลังดึงข้อมูล relay
-torlauncher.bootstrapStatus.conn_or=กำลังเชื่อมต่อสู่เครือข่าย Tor
-torlauncher.bootstrapStatus.handshake_or=กำลังสร้างวงจรเชื่อมต่อ Tor
torlauncher.bootstrapStatus.done=เชื่อมต่อสู่เครือข่าย Tor เรียบร้อย!
torlauncher.bootstrapWarning.done=สำเร็จ
diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties
index c438d31..551323b 100644
--- a/src/chrome/locale/ti/torlauncher.properties
+++ b/src/chrome/locale/ti/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/tk/torlauncher.properties b/src/chrome/locale/tk/torlauncher.properties
index 7a3e6af..7d7cf4d 100644
--- a/src/chrome/locale/tk/torlauncher.properties
+++ b/src/chrome/locale/tk/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties
index e30c41d..2eb5514 100644
--- a/src/chrome/locale/tr/torlauncher.properties
+++ b/src/chrome/locale/tr/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Yardım almak için, %S sayfasına bakabilirsiniz
torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor günlük iletisi bir metin düzenleyici ya da e-posta iletisine kopyalanmaya hazır.
-torlauncher.bootstrapStatus.conn_dir=Bir aktarıcı dizinine bağlanılıyor
-torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı kuruluyor
+torlauncher.bootstrapStatus.onehop_create=Şifrelenmiş dizin bağlantısı kuruluyor
torlauncher.bootstrapStatus.requesting_status=Ağ durumu alınıyor
torlauncher.bootstrapStatus.loading_status=Ağ durumu yükleniyor
torlauncher.bootstrapStatus.loading_keys=Otorite sertifikaları yükleniyor
torlauncher.bootstrapStatus.requesting_descriptors=Aktarıcı bilgisi isteniyor
torlauncher.bootstrapStatus.loading_descriptors=Aktarıcı bilgisi yükleniyor
-torlauncher.bootstrapStatus.conn_or=Tor ağına bağlanılıyor
-torlauncher.bootstrapStatus.handshake_or=Bir Tor devresi kuruluyor
torlauncher.bootstrapStatus.done=Tor ağına bağlanıldı!
torlauncher.bootstrapWarning.done=bitti
diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties
index cad5d23..cd37550 100644
--- a/src/chrome/locale/uk/torlauncher.properties
+++ b/src/chrome/locale/uk/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Для отримання допомоги, будь
torlauncher.copiedNLogMessages=Копіювання завершено. %S повідомлень журналу tor готові до вставки у текстовий редактор або повідомлення електронної пошти.
-torlauncher.bootstrapStatus.conn_dir=З'єднання з довідником маршрутизатора
-torlauncher.bootstrapStatus.handshake_dir=Встановлення зашифрованого з'єднання до каталогу
+torlauncher.bootstrapStatus.onehop_create=Встановлення зашифрованого з'єднання до каталогу
torlauncher.bootstrapStatus.requesting_status=Отримання стану мережі
torlauncher.bootstrapStatus.loading_status=Завантаження стану мережі
torlauncher.bootstrapStatus.loading_keys=Завантаження сертифікатів авторизації
torlauncher.bootstrapStatus.requesting_descriptors=Запит інформації про марщрутизацію
torlauncher.bootstrapStatus.loading_descriptors=Завантаження інформації про маршрутизацію
-torlauncher.bootstrapStatus.conn_or=Підключення до мережі Tor
-torlauncher.bootstrapStatus.handshake_or=Створення ланцюга Tor
torlauncher.bootstrapStatus.done=Підключений до мережі Tor!
torlauncher.bootstrapWarning.done=виконано
diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties
index caf020b..4d1db29 100644
--- a/src/chrome/locale/ur-PK/torlauncher.properties
+++ b/src/chrome/locale/ur-PK/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=ٹار نیٹ ورکس سے رابطہ بنائیں
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties
index caf020b..4d1db29 100644
--- a/src/chrome/locale/ur/torlauncher.properties
+++ b/src/chrome/locale/ur/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=ٹار نیٹ ورکس سے رابطہ بنائیں
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/uz/torlauncher.properties b/src/chrome/locale/uz/torlauncher.properties
index d780d29..7699aa2 100644
--- a/src/chrome/locale/uz/torlauncher.properties
+++ b/src/chrome/locale/uz/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Tor tarmog'iga ulanish
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/ve/torlauncher.properties b/src/chrome/locale/ve/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/ve/torlauncher.properties
+++ b/src/chrome/locale/ve/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties
index 119325f..e95139a 100644
--- a/src/chrome/locale/vi/torlauncher.properties
+++ b/src/chrome/locale/vi/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=Nếu cần sự giúp đỡ, ghé qua %S
torlauncher.copiedNLogMessages=Sao chép hoàn tất. %S thông điệp nhật ký của Tor đã sẵn sàng để dán vào một chương trình sửa văn bản hoặc một thông điệp email.
-torlauncher.bootstrapStatus.conn_dir=Kết nối vào một thư mục chuyển tiếp
-torlauncher.bootstrapStatus.handshake_dir=Thành lập một kết nối thư mục được mã hóa
+torlauncher.bootstrapStatus.onehop_create=Thành lập một kết nối thư mục được mã hóa
torlauncher.bootstrapStatus.requesting_status=Khôi phục trạng thái mạng
torlauncher.bootstrapStatus.loading_status=Nap tình trạng mạng
torlauncher.bootstrapStatus.loading_keys=Nạp giấy chứng nhận quyền
torlauncher.bootstrapStatus.requesting_descriptors=Yêu cầu thông tin tiếp sức
torlauncher.bootstrapStatus.loading_descriptors=Tải thông tin tiếp sức
-torlauncher.bootstrapStatus.conn_or=Kết nối với mạng Tor
-torlauncher.bootstrapStatus.handshake_or=Thành lập một mạch Tor
torlauncher.bootstrapStatus.done=Kết nối với mạng Tor!
torlauncher.bootstrapWarning.done=làm xong
diff --git a/src/chrome/locale/wa/torlauncher.properties b/src/chrome/locale/wa/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/wa/torlauncher.properties
+++ b/src/chrome/locale/wa/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/wo/torlauncher.properties b/src/chrome/locale/wo/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/wo/torlauncher.properties
+++ b/src/chrome/locale/wo/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties
index d82d688..65407db 100644
--- a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties
+++ b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties
@@ -31,15 +31,12 @@
# torlauncher.forAssistance=For assistance, contact %S
-# torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-# torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+# torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
# torlauncher.bootstrapStatus.requesting_status=Retrieving network status
# torlauncher.bootstrapStatus.loading_status=Loading network status
# torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
# torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
# torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-# torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-# torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
# torlauncher.bootstrapStatus.done=Connected to the Tor network!
# torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties
index 3c425e2..55c4e54 100644
--- a/src/chrome/locale/zh-CN/torlauncher.properties
+++ b/src/chrome/locale/zh-CN/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=如需帮助,请访问 %S
torlauncher.copiedNLogMessages=复制完成。%S 条 Tor 日志信息已准备好,可以将其粘贴到文本编辑器或电子邮件中。
-torlauncher.bootstrapStatus.conn_dir=正在连接中继目录
-torlauncher.bootstrapStatus.handshake_dir=正在建立加密的目录连接
+torlauncher.bootstrapStatus.onehop_create=正在建立加密的目录连接
torlauncher.bootstrapStatus.requesting_status=正在检索网络状态
torlauncher.bootstrapStatus.loading_status=正在载入网络状态
torlauncher.bootstrapStatus.loading_keys=正在载入证书颁发机构证书
torlauncher.bootstrapStatus.requesting_descriptors=正在请求中继信息
torlauncher.bootstrapStatus.loading_descriptors=正在载入中继信息
-torlauncher.bootstrapStatus.conn_or=正在连接 Tor 网络
-torlauncher.bootstrapStatus.handshake_or=正在建立 Tor 线路
torlauncher.bootstrapStatus.done=Tor 网络已经连接!
torlauncher.bootstrapWarning.done=完成
diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties
index 7844ab6..5eb4cf4 100644
--- a/src/chrome/locale/zh-HK/torlauncher.properties
+++ b/src/chrome/locale/zh-HK/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=如需協助,請到訪%S
torlauncher.copiedNLogMessages=複製完成。%S Tor洋蔥路由日誌已準備好被貼到文字編輯器或電郵。
-torlauncher.bootstrapStatus.conn_dir=正連接至轉向目錄
-torlauncher.bootstrapStatus.handshake_dir=正在建立加密嘅目錄連線
+torlauncher.bootstrapStatus.onehop_create=正在建立加密嘅目錄連線
torlauncher.bootstrapStatus.requesting_status=正在取得網絡狀態
torlauncher.bootstrapStatus.loading_status=正在載入網絡狀態
torlauncher.bootstrapStatus.loading_keys=正在載入授權憑證
torlauncher.bootstrapStatus.requesting_descriptors=正在索取轉向站資訊
torlauncher.bootstrapStatus.loading_descriptors=正在載入轉向站資訊
-torlauncher.bootstrapStatus.conn_or=正連接到Tor洋蔥路由網絡
-torlauncher.bootstrapStatus.handshake_or=正在建立Tor洋蔥路由線路
torlauncher.bootstrapStatus.done=已連接到Tor洋蔥路由網絡!
torlauncher.bootstrapWarning.done=完成
diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties
index 134a2a8..43172ee 100644
--- a/src/chrome/locale/zh-TW/torlauncher.properties
+++ b/src/chrome/locale/zh-TW/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=若需要協助的話,可以造訪 %S
torlauncher.copiedNLogMessages=複製完成。%S 洋蔥路由紀錄訊息已準備好被貼到文字編輯器或是一封電子郵件訊息。
-torlauncher.bootstrapStatus.conn_dir=正連接至中繼目錄
-torlauncher.bootstrapStatus.handshake_dir=正在建立加密的目錄連線
+torlauncher.bootstrapStatus.onehop_create=正在建立加密的目錄連線
torlauncher.bootstrapStatus.requesting_status=正在擷取網路狀態
torlauncher.bootstrapStatus.loading_status=正在載入網路狀態
torlauncher.bootstrapStatus.loading_keys=正在載入授權憑證
torlauncher.bootstrapStatus.requesting_descriptors=正在索取中繼節點資訊
torlauncher.bootstrapStatus.loading_descriptors=正在載入中繼節點資訊
-torlauncher.bootstrapStatus.conn_or=正連接至洋蔥路由網路
-torlauncher.bootstrapStatus.handshake_or=正在建立洋蔥路由迴路
torlauncher.bootstrapStatus.done=已連接到洋蔥路由網路!
torlauncher.bootstrapWarning.done=完成
diff --git a/src/chrome/locale/zh/torlauncher.properties b/src/chrome/locale/zh/torlauncher.properties
index d82d688..65407db 100644
--- a/src/chrome/locale/zh/torlauncher.properties
+++ b/src/chrome/locale/zh/torlauncher.properties
@@ -31,15 +31,12 @@
# torlauncher.forAssistance=For assistance, contact %S
-# torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-# torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+# torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
# torlauncher.bootstrapStatus.requesting_status=Retrieving network status
# torlauncher.bootstrapStatus.loading_status=Loading network status
# torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
# torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
# torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-# torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-# torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
# torlauncher.bootstrapStatus.done=Connected to the Tor network!
# torlauncher.bootstrapWarning.done=done
diff --git a/src/chrome/locale/zu/torlauncher.properties b/src/chrome/locale/zu/torlauncher.properties
index a4d097a..15a3fc1 100644
--- a/src/chrome/locale/zu/torlauncher.properties
+++ b/src/chrome/locale/zu/torlauncher.properties
@@ -52,15 +52,12 @@ torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
-torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
+torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
torlauncher.bootstrapStatus.requesting_status=Retrieving network status
torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
torlauncher.bootstrapWarning.done=done
diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm
index 36abeaa..8b59afb 100644
--- a/src/modules/tl-util.jsm
+++ b/src/modules/tl-util.jsm
@@ -194,10 +194,17 @@ let TorLauncherUtil = // Public
var key;
if (aKeyword == "TAG")
{
- if ("onehop_create" == val)
- val = "handshake_dir";
- else if ("circuit_create" == val)
- val = "handshake_or";
+ // The bootstrap status tags in tagMap below are used by Tor
+ // versions prior to 0.4.0.x. We map each one to the tag that will
+ // produce the localized string that is the best fit.
+ let tagMap =
+ {
+ "conn_dir": "conn",
+ "handshake_dir": "onehop_create",
+ "conn_or": "enough_dirinfo",
+ "handshake_or": "ap_conn"
+ };
+ if (val in tagMap) val = tagMap[val];
key = "bootstrapStatus." + val;
fallbackStr = aStatusObj.SUMMARY;
1
0

[tor-browser-build/master] Bug 29183: Use linux-x86_64 langpacks on linux-x86_64
by gk@torproject.org 06 Feb '19
by gk@torproject.org 06 Feb '19
06 Feb '19
commit 86ebdafc28a55042fea553ad7f23f796ea963b75
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Wed Feb 6 17:16:40 2019 +0100
Bug 29183: Use linux-x86_64 langpacks on linux-x86_64
We were previously using the linux-i686 langpacks in the linux-x86_64
builds.
---
projects/firefox-langpacks/config | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 04cd7dd..17a707a 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -5,10 +5,12 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
var:
ff_version: '[% pc("firefox", "var/firefox_version") %]'
ff_build: build2
- ff_arch: linux-i686
input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
targets:
+ linux:
+ var:
+ ff_arch: 'linux-[% c("arch") %]'
windows-i686:
var:
ff_arch: win32
1
0