tor-commits
Threads by month
- ----- 2025 -----
- 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
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
June 2015
- 22 participants
- 1870 discussions

[onionoo/master] Avoid error because of non-existant descriptor type
by karsten@torproject.org 25 Jun '15
by karsten@torproject.org 25 Jun '15
25 Jun '15
commit c04a33a074a9815b0c146192b3b14225da15f7de
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Thu Jun 25 14:15:26 2015 +0200
Avoid error because of non-existant descriptor type
When splitting up the hourly updater into three phases, we lost the
ability to skip downloading descriptors we're not going to process
later. Hence, we'll get an error because CollecTor doesn't serve
bridge-pool assignments anymore. But we don't parse them anyway, so
we can as well remove them from our list of descriptors we might care
about. That avoids this specific error.
---
.../org/torproject/onionoo/updater/DescriptorDownloader.java | 3 ---
.../java/org/torproject/onionoo/updater/DescriptorHistory.java | 1 -
.../java/org/torproject/onionoo/updater/DescriptorQueue.java | 6 ------
.../java/org/torproject/onionoo/updater/DescriptorSource.java | 7 -------
.../java/org/torproject/onionoo/updater/DescriptorType.java | 1 -
.../org/torproject/onionoo/updater/DummyDescriptorSource.java | 1 -
6 files changed, 19 deletions(-)
diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorDownloader.java b/src/main/java/org/torproject/onionoo/updater/DescriptorDownloader.java
index 9e2f80d..d5b6c49 100644
--- a/src/main/java/org/torproject/onionoo/updater/DescriptorDownloader.java
+++ b/src/main/java/org/torproject/onionoo/updater/DescriptorDownloader.java
@@ -52,9 +52,6 @@ class DescriptorDownloader {
case BRIDGE_EXTRA_INFOS:
this.directory = "bridge-descriptors/extra-infos/";
break;
- case BRIDGE_POOL_ASSIGNMENTS:
- this.directory = "bridge-pool-assignments/";
- break;
default:
log.error("Unknown descriptor type.");
return;
diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorHistory.java b/src/main/java/org/torproject/onionoo/updater/DescriptorHistory.java
index 0f6f578..e6d911e 100644
--- a/src/main/java/org/torproject/onionoo/updater/DescriptorHistory.java
+++ b/src/main/java/org/torproject/onionoo/updater/DescriptorHistory.java
@@ -8,5 +8,4 @@ enum DescriptorHistory {
BRIDGE_STATUS_HISTORY,
BRIDGE_SERVER_HISTORY,
BRIDGE_EXTRAINFO_HISTORY,
- BRIDGE_POOLASSIGN_HISTORY,
}
\ No newline at end of file
diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java b/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java
index b86d585..6740ca9 100644
--- a/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java
+++ b/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java
@@ -89,9 +89,6 @@ class DescriptorQueue {
case BRIDGE_EXTRA_INFOS:
directoryName = "bridge-descriptors/extra-infos";
break;
- case BRIDGE_POOL_ASSIGNMENTS:
- directoryName = "bridge-pool-assignments";
- break;
case EXIT_LISTS:
directoryName = "exit-lists";
break;
@@ -133,9 +130,6 @@ class DescriptorQueue {
case EXIT_LIST_HISTORY:
historyFileName = "exit-list-history";
break;
- case BRIDGE_POOLASSIGN_HISTORY:
- historyFileName = "bridge-poolassign-history";
- break;
case RELAY_CONSENSUS_HISTORY:
historyFileName = "relay-consensus-history";
break;
diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java
index b26a692..a1e489e 100644
--- a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java
+++ b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java
@@ -101,10 +101,6 @@ public class DescriptorSource {
log.debug("Reading recent " + DescriptorType.BRIDGE_EXTRA_INFOS + " ...");
this.readDescriptors(DescriptorType.BRIDGE_EXTRA_INFOS,
DescriptorHistory.BRIDGE_EXTRAINFO_HISTORY, false);
- log.debug("Reading recent " + DescriptorType.BRIDGE_POOL_ASSIGNMENTS
- + " ...");
- this.readDescriptors(DescriptorType.BRIDGE_POOL_ASSIGNMENTS,
- DescriptorHistory.BRIDGE_POOLASSIGN_HISTORY, false);
log.debug("Reading recent " + DescriptorType.BRIDGE_STATUSES + " ...");
this.readDescriptors(DescriptorType.BRIDGE_STATUSES,
DescriptorHistory.BRIDGE_STATUS_HISTORY, false);
@@ -147,9 +143,6 @@ public class DescriptorSource {
case BRIDGE_EXTRA_INFOS:
log.info("Read recent bridge extra-info descriptors");
break;
- case BRIDGE_POOL_ASSIGNMENTS:
- log.info("Read recent bridge-pool assignments");
- break;
}
}
diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorType.java b/src/main/java/org/torproject/onionoo/updater/DescriptorType.java
index 41956da..60d2759 100644
--- a/src/main/java/org/torproject/onionoo/updater/DescriptorType.java
+++ b/src/main/java/org/torproject/onionoo/updater/DescriptorType.java
@@ -10,6 +10,5 @@ public enum DescriptorType {
BRIDGE_STATUSES,
BRIDGE_SERVER_DESCRIPTORS,
BRIDGE_EXTRA_INFOS,
- BRIDGE_POOL_ASSIGNMENTS,
}
diff --git a/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java b/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java
index 3664e25..10df38a 100644
--- a/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java
+++ b/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java
@@ -64,7 +64,6 @@ public class DummyDescriptorSource extends DescriptorSource {
case BRIDGE_STATUSES:
case BRIDGE_SERVER_DESCRIPTORS:
case BRIDGE_EXTRA_INFOS:
- case BRIDGE_POOL_ASSIGNMENTS:
default:
relay = false;
break;
1
0

25 Jun '15
commit e13ef5f34bc189ecd2d5c96afe3267d544225cee
Author: Harmony <harmony01(a)riseup.net>
Date: Thu Jun 25 11:29:51 2015 +0000
Add section on downloading, and TODO file
---
C/downloading.page | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++
TODO | 55 ++++++++++++++++++++++
2 files changed, 186 insertions(+)
diff --git a/C/downloading.page b/C/downloading.page
new file mode 100644
index 0000000..31b5b7f
--- /dev/null
+++ b/C/downloading.page
@@ -0,0 +1,131 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="downloading">
+
+<info>
+ <desc>How to download Tor Browser</desc>
+ <link type="guide" xref="index" />
+</info>
+
+<title>Downloading</title>
+
+<p>
+The safest and simplest way to download Tor Browser is from the official
+Tor Project website at https://www.torproject.org. Your connection to
+the site will be secured using
+<link xref='secure-connections'>HTTPS</link>, so you can be sure that no
+one is tampering with your copy of the software while you download it.
+</p>
+
+<p>
+However, there may be times when you cannot access the Tor Project
+website: for example, it could be blocked on your network. If this
+happens, you can use one of the alternative download methods listed
+below.
+</p>
+
+<section id="satori">
+<title>Satori</title>
+ <p>
+ Satori is an add-on for the Chrome or Chromium browsers that allows you
+ to download several security and privacy programs from different
+ sources.
+ </p>
+ <p>
+ To download Tor Browser using Satori:
+ </p>
+ <steps>
+ <item>
+ <p>
+ Install Satori from the Chrome App Store.
+ </p>
+ </item>
+ <item>
+ <p>
+ Select Satori from your browser’s Apps menu.
+ </p>
+ </item>
+ <item>
+ <p>
+ When Satori opens, click on your preferred language. A menu will open
+ listing the available downloads for that language. Find the entry for
+ Tor Browser under the name of your operating system. Select
+ either “A” or “B” after the name of the program — each one represents
+ a different source from which to get the software. Your download will
+ then begin.
+ </p>
+ </item>
+ <item>
+ <p>
+ Wait for your download to finish, then find the “Generate Hash”
+ section in Satori’s menu and click “Select Files”.
+ </p>
+ </item>
+ <item>
+ <p>
+ Select the downloaded Tor Browser file. Satori will display the
+ checksum of the file, which you should compare with the software’s
+ original checksum: you can find this by clicking the word “checksum”
+ after the link you clicked on to start the download. If the checksums
+ match, your download was successful, and you can
+ <link xref='first-time'>begin using Tor Browser</link>. If they do not
+ match, you may need to try downloading again, or from a different
+ source.
+ </p>
+ </item>
+ </steps>
+</section>
+
+<section id="gettor">
+<title>GetTor</title>
+ <p>
+ GetTor is an email-based service that automatically responds to
+ messages with links to the latest version of Tor Browser, hosted at a
+ variety of locations, such as Dropbox.
+ </p>
+
+ <p>
+ To use GetTor:
+ </p>
+ <steps>
+ <item>
+ <p>
+ Send an email to gettor(a)torproject.org, and in the body
+ of the message simply write “windows”, “osx”, or “linux”, (without
+ quotation marks) depending on your operating system.
+ </p>
+ </item>
+ <item>
+ <p>
+ GetTor will respond with an email containing links from which you can
+ download the Tor Browser package, the cryptographic signature (needed
+ for verifying the download), the fingerprint of the key used to make
+ the signature, and the package’s checksum. You may be offered a choice
+ of “32-bit” or “64-bit” software: this depends on the model of the
+ computer you are using.
+ </p>
+ </item>
+ </steps>
+</section>
+
+<section id="website-mirror">
+<title>Tor website mirrors</title>
+ <p>
+ A number of volunteers around the world host “mirrors” of the Tor
+ Project website. These are identical copies of all the content and
+ software on the main website, hosted at different IP addresses and
+ URLs. The Tor Project periodically checks mirrored versions of the
+ software to make sure they are the same as the originals.
+ </p>
+
+ <p>
+ If the main Tor website is blocked for you, and the automated
+ distribution methods above do not work, send an email to
+ help(a)rt.torproject.org asking for some website mirror addresses. You
+ should then be able to download Tor Browser as normal from these sites.
+ Please note that you should take extra care to verify the software you
+ download from a mirror, to ensure that it has not been tampered with.
+ </p>
+</section>
+
+</page>
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..7b45e95
--- /dev/null
+++ b/TODO
@@ -0,0 +1,55 @@
+==========
+SHORT TERM
+==========
+
+ADDITIONAL SCREENSHOTS
+
+Produce screenshots illustrating the download methods in the “How to
+download” section (Satori, GetTor, mirrors).
+
+SECTIONS TO ADD/EXPAND/MODIFY
+
+Add a section that explains how to verify the Tor Browser download in
+clear and simple steps.
+
+Expand “Using for the first time” section with guidance on
+extracting/“installing” Tor Browser, and locating it in the filesystem
+on each OS. Cover the need to move TB to OSX Applications folder (and
+not run from disk image). Take into account the change in Mac OSX
+installation once a developer cert is available (ETA: August 2015)
+
+Modify “Bridges” page if/when we have a domain-fronted API to
+autodiscover fresh bridges (ETA: December 2015)
+
+[XXX Add more here XXX]
+
+===========
+MEDIUM TERM
+===========
+
+LOCALIZATION
+
+Plan for the localization of the manual’s text into the set of languages
+for which Tor Browser is currently built; this could be done through
+crowdsourced translation (on Transifex) or by individual translators.
+
+DISTRIBUTION
+
+Work out distribution strategies for the manual. An online copy will be
+available, and could be promoted through Tor’s outreach channels and
+linked to from the website. GetTor could provide links to the manual
+or to a downloadable file. A file could be included in the Tor Browser
+download (see discussion on #11698).
+
+MAINTAINABILITY
+
+Develop a clear plan for updating the manual text as Tor Browser
+evolves. This will involve incorporating user
+feedback/frequently-encountered issues from the help desk assistants,
+and making sure that information about major user interface changes is
+obtained from the Tor Browser team in good time.
+
+OTHER SOFTWARE PRODUCTS
+
+Continue discussion with other software development teams who might
+require user documentation for their products (e.g. Tor Messenger)
1
0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation@torproject.org 25 Jun '15
by translation@torproject.org 25 Jun '15
25 Jun '15
commit 86fa71259fe3a1955f7c00171355ee499be4ab8a
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Jun 25 10:15:52 2015 +0000
Update translations for abouttor-homepage_completed
---
nl/aboutTor.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd
index 6e92558..4abee58 100644
--- a/nl/aboutTor.dtd
+++ b/nl/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Bijkomende informatie:">
<!ENTITY aboutTor.torInfo2.label "Land & IP-adres:">
1
0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation@torproject.org 25 Jun '15
by translation@torproject.org 25 Jun '15
25 Jun '15
commit a647b0d95577c3afdd992807a85c041cb302e366
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Jun 25 08:45:46 2015 +0000
Update translations for abouttor-homepage_completed
---
zh_CN/aboutTor.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zh_CN/aboutTor.dtd b/zh_CN/aboutTor.dtd
index dca1bba..cbb7ea7 100644
--- a/zh_CN/aboutTor.dtd
+++ b/zh_CN/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "更多信息:">
<!ENTITY aboutTor.torInfo2.label "国家与 IP 地址:">
1
0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation@torproject.org 25 Jun '15
by translation@torproject.org 25 Jun '15
25 Jun '15
commit 8417e76c7b78e53622fbd51cd75420ddbec372c7
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Jun 25 08:17:14 2015 +0000
Update translations for abouttor-homepage_completed
---
en/aboutTor.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/en/aboutTor.dtd
+++ b/en/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
1
0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation@torproject.org 25 Jun '15
by translation@torproject.org 25 Jun '15
25 Jun '15
commit a6fa031e13660c715c2dfcdca2042c31444c9f9a
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Jun 25 08:17:08 2015 +0000
Update translations for abouttor-homepage
---
ach/aboutTor.dtd | 2 +-
ady/aboutTor.dtd | 2 +-
af/aboutTor.dtd | 2 +-
ak/aboutTor.dtd | 2 +-
am/aboutTor.dtd | 2 +-
ar/aboutTor.dtd | 2 +-
arn/aboutTor.dtd | 2 +-
ast/aboutTor.dtd | 2 +-
az/aboutTor.dtd | 2 +-
ba/aboutTor.dtd | 2 +-
be/aboutTor.dtd | 2 +-
bg/aboutTor.dtd | 2 +-
bn/aboutTor.dtd | 2 +-
bn_IN/aboutTor.dtd | 2 +-
bo/aboutTor.dtd | 2 +-
br/aboutTor.dtd | 2 +-
bs/aboutTor.dtd | 2 +-
ca/aboutTor.dtd | 2 +-
cs/aboutTor.dtd | 2 +-
csb/aboutTor.dtd | 2 +-
cv/aboutTor.dtd | 2 +-
cy/aboutTor.dtd | 2 +-
cy_GB/aboutTor.dtd | 2 +-
da/aboutTor.dtd | 2 +-
de/aboutTor.dtd | 2 +-
dz/aboutTor.dtd | 2 +-
el/aboutTor.dtd | 2 +-
en/aboutTor.dtd | 2 +-
en_GB/aboutTor.dtd | 2 +-
eo/aboutTor.dtd | 2 +-
es/aboutTor.dtd | 2 +-
es_AR/aboutTor.dtd | 2 +-
es_CL/aboutTor.dtd | 2 +-
es_CO/aboutTor.dtd | 2 +-
es_MX/aboutTor.dtd | 2 +-
et/aboutTor.dtd | 2 +-
eu/aboutTor.dtd | 2 +-
fa/aboutTor.dtd | 2 +-
fi/aboutTor.dtd | 2 +-
fil/aboutTor.dtd | 2 +-
fo/aboutTor.dtd | 2 +-
fr/aboutTor.dtd | 2 +-
fr_CA/aboutTor.dtd | 2 +-
fur/aboutTor.dtd | 2 +-
fy/aboutTor.dtd | 2 +-
ga/aboutTor.dtd | 2 +-
gd/aboutTor.dtd | 2 +-
gl/aboutTor.dtd | 2 +-
gu/aboutTor.dtd | 2 +-
gu_IN/aboutTor.dtd | 2 +-
gun/aboutTor.dtd | 2 +-
ha/aboutTor.dtd | 2 +-
he/aboutTor.dtd | 2 +-
hi/aboutTor.dtd | 2 +-
hr/aboutTor.dtd | 2 +-
hr_HR/aboutTor.dtd | 2 +-
ht/aboutTor.dtd | 2 +-
hu/aboutTor.dtd | 2 +-
hy/aboutTor.dtd | 2 +-
hy_AM/aboutTor.dtd | 2 +-
ia/aboutTor.dtd | 2 +-
id/aboutTor.dtd | 2 +-
is/aboutTor.dtd | 2 +-
it/aboutTor.dtd | 2 +-
ja/aboutTor.dtd | 2 +-
jbo/aboutTor.dtd | 2 +-
jv/aboutTor.dtd | 2 +-
ka/aboutTor.dtd | 2 +-
kk/aboutTor.dtd | 2 +-
km/aboutTor.dtd | 2 +-
kn/aboutTor.dtd | 2 +-
ko/aboutTor.dtd | 2 +-
ko_KR/aboutTor.dtd | 2 +-
ku/aboutTor.dtd | 2 +-
ku_IQ/aboutTor.dtd | 2 +-
kw/aboutTor.dtd | 2 +-
ky/aboutTor.dtd | 2 +-
la/aboutTor.dtd | 2 +-
lb/aboutTor.dtd | 2 +-
lg/aboutTor.dtd | 2 +-
ln/aboutTor.dtd | 2 +-
lo/aboutTor.dtd | 2 +-
lt/aboutTor.dtd | 2 +-
lv/aboutTor.dtd | 2 +-
mg/aboutTor.dtd | 2 +-
mi/aboutTor.dtd | 2 +-
mk/aboutTor.dtd | 2 +-
ml/aboutTor.dtd | 2 +-
mn/aboutTor.dtd | 2 +-
mr/aboutTor.dtd | 2 +-
ms_MY/aboutTor.dtd | 2 +-
mt/aboutTor.dtd | 2 +-
my/aboutTor.dtd | 2 +-
nah/aboutTor.dtd | 2 +-
nap/aboutTor.dtd | 2 +-
nb/aboutTor.dtd | 2 +-
nds/aboutTor.dtd | 2 +-
ne/aboutTor.dtd | 2 +-
nl/aboutTor.dtd | 2 +-
nl_BE/aboutTor.dtd | 2 +-
nn/aboutTor.dtd | 2 +-
nso/aboutTor.dtd | 2 +-
oc/aboutTor.dtd | 2 +-
or/aboutTor.dtd | 2 +-
pa/aboutTor.dtd | 2 +-
pap/aboutTor.dtd | 2 +-
pl/aboutTor.dtd | 2 +-
pms/aboutTor.dtd | 2 +-
ps/aboutTor.dtd | 2 +-
pt/aboutTor.dtd | 2 +-
pt_BR/aboutTor.dtd | 2 +-
ro/aboutTor.dtd | 2 +-
ru/aboutTor.dtd | 2 +-
ru(a)petr1708/aboutTor.dtd | 2 +-
sa/aboutTor.dtd | 2 +-
scn/aboutTor.dtd | 2 +-
sco/aboutTor.dtd | 2 +-
si/aboutTor.dtd | 2 +-
si_LK/aboutTor.dtd | 2 +-
sk/aboutTor.dtd | 2 +-
sk_SK/aboutTor.dtd | 2 +-
sl/aboutTor.dtd | 2 +-
sl_SI/aboutTor.dtd | 2 +-
sn/aboutTor.dtd | 2 +-
so/aboutTor.dtd | 2 +-
son/aboutTor.dtd | 2 +-
sq/aboutTor.dtd | 2 +-
sr/aboutTor.dtd | 2 +-
sr(a)latin/aboutTor.dtd | 2 +-
st/aboutTor.dtd | 2 +-
su/aboutTor.dtd | 2 +-
sv/aboutTor.dtd | 2 +-
sw/aboutTor.dtd | 2 +-
szl/aboutTor.dtd | 2 +-
ta/aboutTor.dtd | 2 +-
te/aboutTor.dtd | 2 +-
te_IN/aboutTor.dtd | 2 +-
tg/aboutTor.dtd | 2 +-
th/aboutTor.dtd | 2 +-
ti/aboutTor.dtd | 2 +-
tk/aboutTor.dtd | 2 +-
tl_PH/aboutTor.dtd | 2 +-
tr/aboutTor.dtd | 2 +-
ug(a)Arab/aboutTor.dtd | 2 +-
uk/aboutTor.dtd | 2 +-
ur/aboutTor.dtd | 2 +-
ur_PK/aboutTor.dtd | 2 +-
uz/aboutTor.dtd | 2 +-
ve/aboutTor.dtd | 2 +-
vi/aboutTor.dtd | 2 +-
wa/aboutTor.dtd | 2 +-
wo/aboutTor.dtd | 2 +-
yo/aboutTor.dtd | 2 +-
zh_CN/aboutTor.dtd | 2 +-
zh_HK/aboutTor.dtd | 2 +-
zh_TW/aboutTor.dtd | 2 +-
zu/aboutTor.dtd | 2 +-
157 files changed, 157 insertions(+), 157 deletions(-)
diff --git a/ach/aboutTor.dtd b/ach/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ach/aboutTor.dtd
+++ b/ach/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ady/aboutTor.dtd b/ady/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ady/aboutTor.dtd
+++ b/ady/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/af/aboutTor.dtd b/af/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/af/aboutTor.dtd
+++ b/af/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ak/aboutTor.dtd b/ak/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ak/aboutTor.dtd
+++ b/ak/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/am/aboutTor.dtd b/am/aboutTor.dtd
index bda5e14..8b0b2a4 100644
--- a/am/aboutTor.dtd
+++ b/am/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd
index 4ca0c02..710c264 100644
--- a/ar/aboutTor.dtd
+++ b/ar/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "معلومات إضافية:">
<!ENTITY aboutTor.torInfo2.label "الدولة وعنوان الإنترنت:">
diff --git a/arn/aboutTor.dtd b/arn/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/arn/aboutTor.dtd
+++ b/arn/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ast/aboutTor.dtd b/ast/aboutTor.dtd
index 7ac4bb9..1caba77 100644
--- a/ast/aboutTor.dtd
+++ b/ast/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/az/aboutTor.dtd b/az/aboutTor.dtd
index 20639a2..b89de9a 100644
--- a/az/aboutTor.dtd
+++ b/az/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Əlavə məlumat:">
<!ENTITY aboutTor.torInfo2.label "Ölkə və IP Ünvan:">
diff --git a/ba/aboutTor.dtd b/ba/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ba/aboutTor.dtd
+++ b/ba/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/be/aboutTor.dtd b/be/aboutTor.dtd
index 87762a5..3f4d6f5 100644
--- a/be/aboutTor.dtd
+++ b/be/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/bg/aboutTor.dtd b/bg/aboutTor.dtd
index fa4b18a..8f1859d 100644
--- a/bg/aboutTor.dtd
+++ b/bg/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Допълнителна информация:">
<!ENTITY aboutTor.torInfo2.label "Държава и IP адрес:">
diff --git a/bn/aboutTor.dtd b/bn/aboutTor.dtd
index 54f00bc..362e612 100644
--- a/bn/aboutTor.dtd
+++ b/bn/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/bn_IN/aboutTor.dtd b/bn_IN/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/bn_IN/aboutTor.dtd
+++ b/bn_IN/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/bo/aboutTor.dtd b/bo/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/bo/aboutTor.dtd
+++ b/bo/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/br/aboutTor.dtd b/br/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/br/aboutTor.dtd
+++ b/br/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/bs/aboutTor.dtd b/bs/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/bs/aboutTor.dtd
+++ b/bs/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd
index fc1794e..074dc64 100644
--- a/ca/aboutTor.dtd
+++ b/ca/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Més informació:">
<!ENTITY aboutTor.torInfo2.label "Estat i Adreça IP:">
diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd
index d54e03b..291c9a7 100644
--- a/cs/aboutTor.dtd
+++ b/cs/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Další informace:">
<!ENTITY aboutTor.torInfo2.label "Stát a IP adresa:">
diff --git a/csb/aboutTor.dtd b/csb/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/csb/aboutTor.dtd
+++ b/csb/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/cv/aboutTor.dtd b/cv/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/cv/aboutTor.dtd
+++ b/cv/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/cy/aboutTor.dtd b/cy/aboutTor.dtd
index 1492d96..0c8c914 100644
--- a/cy/aboutTor.dtd
+++ b/cy/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Gwybodaeth ychwanegol: ">
<!ENTITY aboutTor.torInfo2.label "Gwlad a chyfeiriad IP:">
diff --git a/cy_GB/aboutTor.dtd b/cy_GB/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/cy_GB/aboutTor.dtd
+++ b/cy_GB/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd
index 23fd0f5..33e5431 100644
--- a/da/aboutTor.dtd
+++ b/da/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Yderligere information:">
<!ENTITY aboutTor.torInfo2.label "Land og IP Adresse:">
diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index 67e04ad..68dcc78 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Zusätzliche Informationen:">
<!ENTITY aboutTor.torInfo2.label "Land & IP-Adresse:">
diff --git a/dz/aboutTor.dtd b/dz/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/dz/aboutTor.dtd
+++ b/dz/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd
index c74994b..40f8cbe 100644
--- a/el/aboutTor.dtd
+++ b/el/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Επιπλέον Πληροφορίες:">
<!ENTITY aboutTor.torInfo2.label "Χώρα & Διεύθυνση IP:">
diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/en/aboutTor.dtd
+++ b/en/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/en_GB/aboutTor.dtd b/en_GB/aboutTor.dtd
index ac1cc9f..b923233 100644
--- a/en_GB/aboutTor.dtd
+++ b/en_GB/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/eo/aboutTor.dtd b/eo/aboutTor.dtd
index bfb5fd8..173cc83 100644
--- a/eo/aboutTor.dtd
+++ b/eo/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Aldonaj informoj:">
<!ENTITY aboutTor.torInfo2.label "Lando kaj IP-adreso">
diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd
index 77d6c3c..6ccf568 100644
--- a/es/aboutTor.dtd
+++ b/es/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Información adicional:">
<!ENTITY aboutTor.torInfo2.label "País y dirección IP:">
diff --git a/es_AR/aboutTor.dtd b/es_AR/aboutTor.dtd
index b748079..58fa7ad 100644
--- a/es_AR/aboutTor.dtd
+++ b/es_AR/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Informaciòn Adicional:">
<!ENTITY aboutTor.torInfo2.label "País y direccion IP">
diff --git a/es_CL/aboutTor.dtd b/es_CL/aboutTor.dtd
index 0616f08..8bf1bfa 100644
--- a/es_CL/aboutTor.dtd
+++ b/es_CL/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/es_CO/aboutTor.dtd b/es_CO/aboutTor.dtd
index 11c9c47..894f362 100644
--- a/es_CO/aboutTor.dtd
+++ b/es_CO/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Información adicional:">
<!ENTITY aboutTor.torInfo2.label "País y Dirección IP:">
diff --git a/es_MX/aboutTor.dtd b/es_MX/aboutTor.dtd
index ea170ec..bde91fe 100644
--- a/es_MX/aboutTor.dtd
+++ b/es_MX/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/et/aboutTor.dtd b/et/aboutTor.dtd
index 89fba66..8b050f1 100644
--- a/et/aboutTor.dtd
+++ b/et/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/eu/aboutTor.dtd b/eu/aboutTor.dtd
index 03bf31d..b055a40 100644
--- a/eu/aboutTor.dtd
+++ b/eu/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Informazio gehiago:">
<!ENTITY aboutTor.torInfo2.label "Herrialde eta IP helbidea:">
diff --git a/fa/aboutTor.dtd b/fa/aboutTor.dtd
index a7bd20f..95bbcad 100644
--- a/fa/aboutTor.dtd
+++ b/fa/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "اطلاعات بيشتر">
<!ENTITY aboutTor.torInfo2.label "كشور و آدرس آى پی:">
diff --git a/fi/aboutTor.dtd b/fi/aboutTor.dtd
index 96baccb..809a451 100644
--- a/fi/aboutTor.dtd
+++ b/fi/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Lisätietoa:">
<!ENTITY aboutTor.torInfo2.label "Maa ja IP-osoite:">
diff --git a/fil/aboutTor.dtd b/fil/aboutTor.dtd
index 331311d..19582b9 100644
--- a/fil/aboutTor.dtd
+++ b/fil/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/fo/aboutTor.dtd b/fo/aboutTor.dtd
index ec3a057..36e2498 100644
--- a/fo/aboutTor.dtd
+++ b/fo/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd
index baeba8e..576ca2f 100644
--- a/fr/aboutTor.dtd
+++ b/fr/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Informations supplémentaires :">
<!ENTITY aboutTor.torInfo2.label "Pays & adresse IP :">
diff --git a/fr_CA/aboutTor.dtd b/fr_CA/aboutTor.dtd
index cda0497..2da8a53 100644
--- a/fr_CA/aboutTor.dtd
+++ b/fr_CA/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/?ses=Google&location_option=CA&option=…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Informations supplémentaires :">
<!ENTITY aboutTor.torInfo2.label "Pays & adresse IP :">
diff --git a/fur/aboutTor.dtd b/fur/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/fur/aboutTor.dtd
+++ b/fur/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/fy/aboutTor.dtd b/fy/aboutTor.dtd
index 77b50a0..c8742f6 100644
--- a/fy/aboutTor.dtd
+++ b/fy/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Lân & IP-adres:">
diff --git a/ga/aboutTor.dtd b/ga/aboutTor.dtd
index 30f62e6..ae168f8 100644
--- a/ga/aboutTor.dtd
+++ b/ga/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Tuilleadh Eolais:">
<!ENTITY aboutTor.torInfo2.label "Tír & Seoladh IP:">
diff --git a/gd/aboutTor.dtd b/gd/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/gd/aboutTor.dtd
+++ b/gd/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/gl/aboutTor.dtd b/gl/aboutTor.dtd
index 345b694..64e99ac 100644
--- a/gl/aboutTor.dtd
+++ b/gl/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Información adicional:">
<!ENTITY aboutTor.torInfo2.label "País & enderezo IP:">
diff --git a/gu/aboutTor.dtd b/gu/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/gu/aboutTor.dtd
+++ b/gu/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/gu_IN/aboutTor.dtd b/gu_IN/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/gu_IN/aboutTor.dtd
+++ b/gu_IN/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/gun/aboutTor.dtd b/gun/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/gun/aboutTor.dtd
+++ b/gun/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ha/aboutTor.dtd b/ha/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ha/aboutTor.dtd
+++ b/ha/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd
index e751e4d..ad235a4 100644
--- a/he/aboutTor.dtd
+++ b/he/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "מידע נוסף:">
<!ENTITY aboutTor.torInfo2.label "מדינה וכתובת IP:">
diff --git a/hi/aboutTor.dtd b/hi/aboutTor.dtd
index be793a4..9061481 100644
--- a/hi/aboutTor.dtd
+++ b/hi/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/hr/aboutTor.dtd b/hr/aboutTor.dtd
index dd63267..38c5ded 100644
--- a/hr/aboutTor.dtd
+++ b/hr/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/hr_HR/aboutTor.dtd b/hr_HR/aboutTor.dtd
index 1887b2c..f162e20 100644
--- a/hr_HR/aboutTor.dtd
+++ b/hr_HR/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Dodatne informacije:">
<!ENTITY aboutTor.torInfo2.label "Država i IP Adresa:">
diff --git a/ht/aboutTor.dtd b/ht/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ht/aboutTor.dtd
+++ b/ht/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/hu/aboutTor.dtd b/hu/aboutTor.dtd
index 30bdaee..bf25da3 100644
--- a/hu/aboutTor.dtd
+++ b/hu/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "További infó:">
<!ENTITY aboutTor.torInfo2.label "Ország & IP cím:">
diff --git a/hy/aboutTor.dtd b/hy/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/hy/aboutTor.dtd
+++ b/hy/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/hy_AM/aboutTor.dtd b/hy_AM/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/hy_AM/aboutTor.dtd
+++ b/hy_AM/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ia/aboutTor.dtd b/ia/aboutTor.dtd
index d28d367..0b5b3ff 100644
--- a/ia/aboutTor.dtd
+++ b/ia/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/id/aboutTor.dtd b/id/aboutTor.dtd
index 715a64b..d0c2fd5 100644
--- a/id/aboutTor.dtd
+++ b/id/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Info Tambahan:">
<!ENTITY aboutTor.torInfo2.label "Negara & Alamat IP:">
diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd
index 85e6203..2340191 100644
--- a/is/aboutTor.dtd
+++ b/is/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd
index 4e80cf2..e7d0041 100644
--- a/it/aboutTor.dtd
+++ b/it/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Ulteriori Info:">
<!ENTITY aboutTor.torInfo2.label "Nazione & Indirizzo IP:">
diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd
index 974820c..453ac4f 100644
--- a/ja/aboutTor.dtd
+++ b/ja/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "追加情報: ">
<!ENTITY aboutTor.torInfo2.label "国とIPアドレス:">
diff --git a/jbo/aboutTor.dtd b/jbo/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/jbo/aboutTor.dtd
+++ b/jbo/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/jv/aboutTor.dtd b/jv/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/jv/aboutTor.dtd
+++ b/jv/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ka/aboutTor.dtd b/ka/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ka/aboutTor.dtd
+++ b/ka/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/kk/aboutTor.dtd b/kk/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/kk/aboutTor.dtd
+++ b/kk/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/km/aboutTor.dtd b/km/aboutTor.dtd
index 3ee2629..a7e6560 100644
--- a/km/aboutTor.dtd
+++ b/km/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "ព័ត៌មានបន្ថែម៖">
<!ENTITY aboutTor.torInfo2.label "ប្រទេស & អាសយដ្ឋាន IP៖">
diff --git a/kn/aboutTor.dtd b/kn/aboutTor.dtd
index 0966ade..f61c491 100644
--- a/kn/aboutTor.dtd
+++ b/kn/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ko/aboutTor.dtd b/ko/aboutTor.dtd
index 523188e..89d3ef3 100644
--- a/ko/aboutTor.dtd
+++ b/ko/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "추가 정보 :">
<!ENTITY aboutTor.torInfo2.label "국가 & IP 주소 :">
diff --git a/ko_KR/aboutTor.dtd b/ko_KR/aboutTor.dtd
index 609cb6e..70158f5 100644
--- a/ko_KR/aboutTor.dtd
+++ b/ko_KR/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ku/aboutTor.dtd b/ku/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ku/aboutTor.dtd
+++ b/ku/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ku_IQ/aboutTor.dtd b/ku_IQ/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ku_IQ/aboutTor.dtd
+++ b/ku_IQ/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/kw/aboutTor.dtd b/kw/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/kw/aboutTor.dtd
+++ b/kw/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ky/aboutTor.dtd b/ky/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ky/aboutTor.dtd
+++ b/ky/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/la/aboutTor.dtd b/la/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/la/aboutTor.dtd
+++ b/la/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/lb/aboutTor.dtd b/lb/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/lb/aboutTor.dtd
+++ b/lb/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/lg/aboutTor.dtd b/lg/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/lg/aboutTor.dtd
+++ b/lg/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ln/aboutTor.dtd b/ln/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ln/aboutTor.dtd
+++ b/ln/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/lo/aboutTor.dtd b/lo/aboutTor.dtd
index 1a801ea..a22821b 100644
--- a/lo/aboutTor.dtd
+++ b/lo/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/lt/aboutTor.dtd b/lt/aboutTor.dtd
index 69dd6d6..1adbf05 100644
--- a/lt/aboutTor.dtd
+++ b/lt/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/lv/aboutTor.dtd b/lv/aboutTor.dtd
index 75107f1..c49273f 100644
--- a/lv/aboutTor.dtd
+++ b/lv/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Papildu informācija:">
<!ENTITY aboutTor.torInfo2.label "Valsts un IP adrese:">
diff --git a/mg/aboutTor.dtd b/mg/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/mg/aboutTor.dtd
+++ b/mg/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/mi/aboutTor.dtd b/mi/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/mi/aboutTor.dtd
+++ b/mi/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/mk/aboutTor.dtd b/mk/aboutTor.dtd
index 3c6d112..e4e2577 100644
--- a/mk/aboutTor.dtd
+++ b/mk/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ml/aboutTor.dtd b/ml/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ml/aboutTor.dtd
+++ b/ml/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/mn/aboutTor.dtd b/mn/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/mn/aboutTor.dtd
+++ b/mn/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/mr/aboutTor.dtd b/mr/aboutTor.dtd
index 81b5c95..ab828e1 100644
--- a/mr/aboutTor.dtd
+++ b/mr/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ms_MY/aboutTor.dtd b/ms_MY/aboutTor.dtd
index b08bf43..0312009 100644
--- a/ms_MY/aboutTor.dtd
+++ b/ms_MY/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Maklumat tambahan:">
<!ENTITY aboutTor.torInfo2.label "Negara & Alamat IP:">
diff --git a/mt/aboutTor.dtd b/mt/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/mt/aboutTor.dtd
+++ b/mt/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/my/aboutTor.dtd b/my/aboutTor.dtd
index a93adc3..dd5fe64 100644
--- a/my/aboutTor.dtd
+++ b/my/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/nah/aboutTor.dtd b/nah/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/nah/aboutTor.dtd
+++ b/nah/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/nap/aboutTor.dtd b/nap/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/nap/aboutTor.dtd
+++ b/nap/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd
index fce49cc..e6a0a83 100644
--- a/nb/aboutTor.dtd
+++ b/nb/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Tilleggsinformasjon:">
<!ENTITY aboutTor.torInfo2.label "Land & IP-adresse:">
diff --git a/nds/aboutTor.dtd b/nds/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/nds/aboutTor.dtd
+++ b/nds/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ne/aboutTor.dtd b/ne/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ne/aboutTor.dtd
+++ b/ne/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd
index 6e92558..4abee58 100644
--- a/nl/aboutTor.dtd
+++ b/nl/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Bijkomende informatie:">
<!ENTITY aboutTor.torInfo2.label "Land & IP-adres:">
diff --git a/nl_BE/aboutTor.dtd b/nl_BE/aboutTor.dtd
index a7ea63b..8b73c99 100644
--- a/nl_BE/aboutTor.dtd
+++ b/nl_BE/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Bijkomende informatie:">
<!ENTITY aboutTor.torInfo2.label "Land & IP Adres:">
diff --git a/nn/aboutTor.dtd b/nn/aboutTor.dtd
index ad81bdd..a00be6d 100644
--- a/nn/aboutTor.dtd
+++ b/nn/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Tilleggsinfo:">
<!ENTITY aboutTor.torInfo2.label "Land og IP-adresse:">
diff --git a/nso/aboutTor.dtd b/nso/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/nso/aboutTor.dtd
+++ b/nso/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/oc/aboutTor.dtd b/oc/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/oc/aboutTor.dtd
+++ b/oc/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/or/aboutTor.dtd b/or/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/or/aboutTor.dtd
+++ b/or/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/pa/aboutTor.dtd b/pa/aboutTor.dtd
index 92db7a3..902e040 100644
--- a/pa/aboutTor.dtd
+++ b/pa/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "ਹੋਰ ਜਾਣਕਾਰੀ:">
<!ENTITY aboutTor.torInfo2.label "ਦੇਸ਼ ਤੇ ਆਈਪੀ ਸਿਰਨਾਵਾਂ:">
diff --git a/pap/aboutTor.dtd b/pap/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/pap/aboutTor.dtd
+++ b/pap/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/pl/aboutTor.dtd b/pl/aboutTor.dtd
index d3a938d..073f82b 100644
--- a/pl/aboutTor.dtd
+++ b/pl/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Dodatkowe informacje:">
<!ENTITY aboutTor.torInfo2.label "Kraj i adres IP:">
diff --git a/pms/aboutTor.dtd b/pms/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/pms/aboutTor.dtd
+++ b/pms/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ps/aboutTor.dtd b/ps/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ps/aboutTor.dtd
+++ b/ps/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/pt/aboutTor.dtd b/pt/aboutTor.dtd
index bdfaec2..65aadb6 100644
--- a/pt/aboutTor.dtd
+++ b/pt/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Informação adicional:">
<!ENTITY aboutTor.torInfo2.label "País e Endereço de IP:">
diff --git a/pt_BR/aboutTor.dtd b/pt_BR/aboutTor.dtd
index e9713d4..d118bae 100644
--- a/pt_BR/aboutTor.dtd
+++ b/pt_BR/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Para outras informações:">
<!ENTITY aboutTor.torInfo2.label "País e Endereço IP:">
diff --git a/ro/aboutTor.dtd b/ro/aboutTor.dtd
index f776531..cbb4170 100644
--- a/ro/aboutTor.dtd
+++ b/ro/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Informații adiționale:">
<!ENTITY aboutTor.torInfo2.label "Țara și adresa IP:">
diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd
index 240386b..8b1c0bb 100644
--- a/ru/aboutTor.dtd
+++ b/ru/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Дополнительные сведения:">
<!ENTITY aboutTor.torInfo2.label "Страна и IP-адрес">
diff --git a/ru(a)petr1708/aboutTor.dtd b/ru(a)petr1708/aboutTor.dtd
index efc1f68..c7887ec 100644
--- a/ru(a)petr1708/aboutTor.dtd
+++ b/ru(a)petr1708/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Дополнительная информація:">
<!ENTITY aboutTor.torInfo2.label "Страна и IP адресъ:">
diff --git a/sa/aboutTor.dtd b/sa/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/sa/aboutTor.dtd
+++ b/sa/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/scn/aboutTor.dtd b/scn/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/scn/aboutTor.dtd
+++ b/scn/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/sco/aboutTor.dtd b/sco/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/sco/aboutTor.dtd
+++ b/sco/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/si/aboutTor.dtd b/si/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/si/aboutTor.dtd
+++ b/si/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/si_LK/aboutTor.dtd b/si_LK/aboutTor.dtd
index eb922bd..6a36849 100644
--- a/si_LK/aboutTor.dtd
+++ b/si_LK/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "අමතර තොරතුරු:">
<!ENTITY aboutTor.torInfo2.label "රට හා IP ලිපිනය:">
diff --git a/sk/aboutTor.dtd b/sk/aboutTor.dtd
index 4ab20e0..0974f67 100644
--- a/sk/aboutTor.dtd
+++ b/sk/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Doplňujúce Informácie:">
<!ENTITY aboutTor.torInfo2.label "Krajina & IP Adresa: ">
diff --git a/sk_SK/aboutTor.dtd b/sk_SK/aboutTor.dtd
index 23b01bf..7bbb164 100644
--- a/sk_SK/aboutTor.dtd
+++ b/sk_SK/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Prídavné informácie:">
<!ENTITY aboutTor.torInfo2.label "Krajina a IP adresa:">
diff --git a/sl/aboutTor.dtd b/sl/aboutTor.dtd
index 17d96e1..0511b37 100644
--- a/sl/aboutTor.dtd
+++ b/sl/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/sl_SI/aboutTor.dtd b/sl_SI/aboutTor.dtd
index 6f3dd27..067c8db 100644
--- a/sl_SI/aboutTor.dtd
+++ b/sl_SI/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Dodatne informacije:">
<!ENTITY aboutTor.torInfo2.label "Država & IP naslov:">
diff --git a/sn/aboutTor.dtd b/sn/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/sn/aboutTor.dtd
+++ b/sn/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/so/aboutTor.dtd b/so/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/so/aboutTor.dtd
+++ b/so/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/son/aboutTor.dtd b/son/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/son/aboutTor.dtd
+++ b/son/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/sq/aboutTor.dtd b/sq/aboutTor.dtd
index fe03515..0854567 100644
--- a/sq/aboutTor.dtd
+++ b/sq/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Informacion Shtesë:">
<!ENTITY aboutTor.torInfo2.label "Vendi & dhe Adresa IP:">
diff --git a/sr/aboutTor.dtd b/sr/aboutTor.dtd
index afb3b5a..5f3035e 100644
--- a/sr/aboutTor.dtd
+++ b/sr/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Додатне информације:">
<!ENTITY aboutTor.torInfo2.label "Држава и ИП адреса:">
diff --git a/sr(a)latin/aboutTor.dtd b/sr(a)latin/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/sr(a)latin/aboutTor.dtd
+++ b/sr(a)latin/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/st/aboutTor.dtd b/st/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/st/aboutTor.dtd
+++ b/st/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/su/aboutTor.dtd b/su/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/su/aboutTor.dtd
+++ b/su/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/sv/aboutTor.dtd b/sv/aboutTor.dtd
index d49c02b..d6406c9 100644
--- a/sv/aboutTor.dtd
+++ b/sv/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Ytterligare information:">
<!ENTITY aboutTor.torInfo2.label "Land och IP-adress:">
diff --git a/sw/aboutTor.dtd b/sw/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/sw/aboutTor.dtd
+++ b/sw/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/szl/aboutTor.dtd b/szl/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/szl/aboutTor.dtd
+++ b/szl/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ta/aboutTor.dtd b/ta/aboutTor.dtd
index e9cbfa1..4f227fa 100644
--- a/ta/aboutTor.dtd
+++ b/ta/aboutTor.dtd
@@ -26,7 +26,7 @@ Tor உலாவியை புதுப்பிக்க பதிவிற
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "கூடுதல் தகவல்:">
<!ENTITY aboutTor.torInfo2.label "நாடு மற்றும் IP முகவரி:">
diff --git a/te/aboutTor.dtd b/te/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/te/aboutTor.dtd
+++ b/te/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/te_IN/aboutTor.dtd b/te_IN/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/te_IN/aboutTor.dtd
+++ b/te_IN/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/tg/aboutTor.dtd b/tg/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/tg/aboutTor.dtd
+++ b/tg/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/th/aboutTor.dtd b/th/aboutTor.dtd
index 50fc5ab..ecb90b5 100644
--- a/th/aboutTor.dtd
+++ b/th/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "ข้อมูลเพิ่มเติม:">
<!ENTITY aboutTor.torInfo2.label "ประเทศและที่อยู่ IP:">
diff --git a/ti/aboutTor.dtd b/ti/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ti/aboutTor.dtd
+++ b/ti/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/tk/aboutTor.dtd b/tk/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/tk/aboutTor.dtd
+++ b/tk/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/tl_PH/aboutTor.dtd b/tl_PH/aboutTor.dtd
index 786aaee..21a6c5e 100644
--- a/tl_PH/aboutTor.dtd
+++ b/tl_PH/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Ekstrang impormasyon">
<!ENTITY aboutTor.torInfo2.label "Bansa at IP Address:">
diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index 56a3fd4..1533cea 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Ek bilgi:">
<!ENTITY aboutTor.torInfo2.label "Ülke ve IP Adresi:">
diff --git a/ug(a)Arab/aboutTor.dtd b/ug(a)Arab/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ug(a)Arab/aboutTor.dtd
+++ b/ug(a)Arab/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/uk/aboutTor.dtd b/uk/aboutTor.dtd
index 4339f47..996f32c 100644
--- a/uk/aboutTor.dtd
+++ b/uk/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Додаткова інформація:">
<!ENTITY aboutTor.torInfo2.label "Країна і IP-адреса:">
diff --git a/ur/aboutTor.dtd b/ur/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ur/aboutTor.dtd
+++ b/ur/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ur_PK/aboutTor.dtd b/ur_PK/aboutTor.dtd
index e0f27d4..9442d5a 100644
--- a/ur_PK/aboutTor.dtd
+++ b/ur_PK/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/uz/aboutTor.dtd b/uz/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/uz/aboutTor.dtd
+++ b/uz/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ve/aboutTor.dtd b/ve/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/ve/aboutTor.dtd
+++ b/ve/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/vi/aboutTor.dtd b/vi/aboutTor.dtd
index c3c8027..6f2f46b 100644
--- a/vi/aboutTor.dtd
+++ b/vi/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Quốc gia & Địa chỉ IP:">
diff --git a/wa/aboutTor.dtd b/wa/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/wa/aboutTor.dtd
+++ b/wa/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/wo/aboutTor.dtd b/wo/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/wo/aboutTor.dtd
+++ b/wo/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/yo/aboutTor.dtd b/yo/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/yo/aboutTor.dtd
+++ b/yo/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/zh_CN/aboutTor.dtd b/zh_CN/aboutTor.dtd
index dca1bba..cbb7ea7 100644
--- a/zh_CN/aboutTor.dtd
+++ b/zh_CN/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "更多信息:">
<!ENTITY aboutTor.torInfo2.label "国家与 IP 地址:">
diff --git a/zh_HK/aboutTor.dtd b/zh_HK/aboutTor.dtd
index a8b9526..f167e10 100644
--- a/zh_HK/aboutTor.dtd
+++ b/zh_HK/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "額外訊息:">
<!ENTITY aboutTor.torInfo2.label "國家及IP地址:">
diff --git a/zh_TW/aboutTor.dtd b/zh_TW/aboutTor.dtd
index a533cc2..6fbfa16 100644
--- a/zh_TW/aboutTor.dtd
+++ b/zh_TW/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "其他資訊:">
<!ENTITY aboutTor.torInfo2.label "國家和 IP 位址:">
diff --git a/zu/aboutTor.dtd b/zu/aboutTor.dtd
index 771f8ae..b923233 100644
--- a/zu/aboutTor.dtd
+++ b/zu/aboutTor.dtd
@@ -25,7 +25,7 @@
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
1
0

[bridgedb/develop] Remove testDistWithFilterBlockedCountries() from legacy_Tests.
by isis@torproject.org 25 Jun '15
by isis@torproject.org 25 Jun '15
25 Jun '15
commit e9713d2a58566b761a68544d552ae5e702008a2d
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sun Apr 19 05:03:40 2015 +0000
Remove testDistWithFilterBlockedCountries() from legacy_Tests.
The functionality tested in testDistWithFilterBlockedCountries() is now
tested in test_Dist.test_HTTPSDistributor_with_blocked_bridges() and
test_Dist.test_HTTPSDistributor_with_some_blocked_bridges().
---
lib/bridgedb/test/legacy_Tests.py | 26 --------------------------
lib/bridgedb/test/test_Dist.py | 2 ++
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py
index 4cdcc03..fc4ca5d 100644
--- a/lib/bridgedb/test/legacy_Tests.py
+++ b/lib/bridgedb/test/legacy_Tests.py
@@ -303,32 +303,6 @@ class IPBridgeDistTests(unittest.TestCase):
filterBridgesByIP4, filterBridgesByIP6])
assert len(b) == 0
- def testDistWithFilterBlockedCountries(self):
- d = bridgedb.Dist.HTTPSDistributor(3, "Foo")
- for _ in xrange(250):
- d.insert(fakeBridge6(or_addresses=True))
- d.insert(fakeBridge(or_addresses=True))
-
- for b in d.hashring.bridges:
- # china blocks all :-(
- for pt in b.transports:
- key = "%s:%s" % (pt.address, pt.port)
- b.blockingCountries[key] = set(['cn'])
- for address, portlist in b.or_addresses.items():
- for port in portlist:
- key = "%s:%s" % (address, port)
- b.blockingCountries[key] = set(['cn'])
- key = "%s:%s" % (b.ip, b.orport)
- b.blockingCountries[key] = set(['cn'])
-
- for i in xrange(5):
- b = d.getBridges(randomIPv4String(), "x", bridgeFilterRules=[
- filterBridgesByNotBlockedIn("cn")])
- assert len(b) == 0
- b = d.getBridges(randomIPv4String(), "x", bridgeFilterRules=[
- filterBridgesByNotBlockedIn("us")])
- assert len(b) > 0
-
def testDistWithFilterBlockedCountriesAdvanced(self):
d = bridgedb.Dist.HTTPSDistributor(3, "Foo")
for _ in xrange(250):
diff --git a/lib/bridgedb/test/test_Dist.py b/lib/bridgedb/test/test_Dist.py
index 3de7945..2d93a19 100644
--- a/lib/bridgedb/test/test_Dist.py
+++ b/lib/bridgedb/test/test_Dist.py
@@ -230,6 +230,7 @@ class HTTPSDistributorTests(unittest.TestCase):
bridges = dist.getBridges(clientRequest1, 1)
for b in bridges:
self.assertFalse(b.isBlockedIn('cn'))
+ self.assertNotIn(b.fingerprint, blockedCN)
# The client *should* have gotten some bridges still.
self.assertGreater(len(bridges), 0)
@@ -237,4 +238,5 @@ class HTTPSDistributorTests(unittest.TestCase):
bridges = dist.getBridges(clientRequest2, 1)
for b in bridges:
self.assertFalse(b.isBlockedIn('ir'))
+ self.assertNotIn(b.fingerprint, blockedIR)
self.assertGreater(len(bridges), 0)
1
0

[bridgedb/develop] Rewrite testDistWithFilterIP4() in legacy_Tests.
by isis@torproject.org 25 Jun '15
by isis@torproject.org 25 Jun '15
25 Jun '15
commit d9dcb7f3d143cfb46f2f1e988da96cf5a5b1b449
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Tue Apr 21 23:34:50 2015 +0000
Rewrite testDistWithFilterIP4() in legacy_Tests.
---
lib/bridgedb/test/legacy_Tests.py | 16 ----------------
lib/bridgedb/test/test_Dist.py | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py
index 043f09b..9a0c74f 100644
--- a/lib/bridgedb/test/legacy_Tests.py
+++ b/lib/bridgedb/test/legacy_Tests.py
@@ -252,22 +252,6 @@ class IPBridgeDistTests(unittest.TestCase):
assert type(ipaddr.IPAddress(address)) is ipaddr.IPv6Address
assert filterBridgesByIP6(random.choice(bridges))
- def testDistWithFilterIP4(self):
- d = bridgedb.Dist.HTTPSDistributor(3, "Foo")
- for _ in xrange(250):
- d.insert(fakeBridge6(or_addresses=True))
- d.insert(fakeBridge(or_addresses=True))
-
- for i in xrange(500):
- bridges = d.getBridges(randomIPv4String(),
- "faketimestamp",
- bridgeFilterRules=[filterBridgesByIP4])
- bridge = random.choice(bridges)
- bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv4Address)
- address, portlist = networkstatus.parseALine(bridge_line)
- assert type(ipaddr.IPAddress(address)) is ipaddr.IPv4Address
- assert filterBridgesByIP4(random.choice(bridges))
-
def testDistWithFilterBlockedCountriesAdvanced(self):
d = bridgedb.Dist.HTTPSDistributor(3, "Foo")
for _ in xrange(250):
diff --git a/lib/bridgedb/test/test_Dist.py b/lib/bridgedb/test/test_Dist.py
index 9e47a92..82ef823 100644
--- a/lib/bridgedb/test/test_Dist.py
+++ b/lib/bridgedb/test/test_Dist.py
@@ -288,3 +288,23 @@ class HTTPSDistributorTests(unittest.TestCase):
address = address.strip('[]')
self.assertIsInstance(ipaddr.IPAddress(address), ipaddr.IPv6Address)
self.assertIsNotNone(filterBridgesByIP6(random.choice(bridges)))
+
+ def test_HTTPSDistributor_getBridges_ipv4(self):
+ """A request for IPv4 bridges should return IPv4 bridges."""
+ dist = Dist.HTTPSDistributor(1, self.key)
+ [dist.insert(bridge) for bridge in self.bridges[:250]]
+
+ for i in xrange(500):
+ bridgeRequest = self.randomClientRequest()
+ bridgeRequest.generateFilters()
+
+ bridges = dist.getBridges(bridgeRequest, "faketimestamp")
+ self.assertTrue(type(bridges) is list)
+ self.assertGreater(len(bridges), 0)
+
+ bridge = random.choice(bridges)
+ bridgeLine = bridge.getBridgeLine(bridgeRequest)
+ addrport, fingerprint = bridgeLine.split()
+ address, port = addrport.rsplit(':', 1)
+ self.assertIsInstance(ipaddr.IPAddress(address), ipaddr.IPv4Address)
+ self.assertIsNotNone(filterBridgesByIP4(random.choice(bridges)))
1
0

25 Jun '15
commit e75d41608d0cec23a4d1240d59f3fb5e2ea593d5
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sun Apr 19 05:31:13 2015 +0000
Rewrite testBasicDist() in legacy_Tests.
---
lib/bridgedb/test/legacy_Tests.py | 8 --------
lib/bridgedb/test/test_Dist.py | 15 +++++++++++++++
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py
index c495412..fd6a739 100644
--- a/lib/bridgedb/test/legacy_Tests.py
+++ b/lib/bridgedb/test/legacy_Tests.py
@@ -185,14 +185,6 @@ class EmailBridgeDistTests(unittest.TestCase):
class IPBridgeDistTests(unittest.TestCase):
- def testBasicDist(self):
- d = bridgedb.Dist.HTTPSDistributor(3, "Foo")
- for _ in xrange(256):
- d.insert(fakeBridge())
- n = d.getBridges("1.2.3.4", "x")
- n2 = d.getBridges("1.2.3.4", "x")
- self.assertEquals(n, n2)
-
def testDistWithProxies(self):
d = bridgedb.Dist.HTTPSDistributor(3, "Foo", [RhymesWith255ProxySet()])
for _ in xrange(256):
diff --git a/lib/bridgedb/test/test_Dist.py b/lib/bridgedb/test/test_Dist.py
index bc437ba..23a6492 100644
--- a/lib/bridgedb/test/test_Dist.py
+++ b/lib/bridgedb/test/test_Dist.py
@@ -243,6 +243,21 @@ class HTTPSDistributorTests(unittest.TestCase):
self.assertNotIn(b.fingerprint, blockedIR)
self.assertGreater(len(bridges), 0)
+ def test_HTTPSDistributor_getBridges_same_bridges_to_same_client(self):
+ """The same client asking for bridges from the HTTPSDistributor
+ multiple times in a row should get the same bridges in response each
+ time.
+ """
+ dist = Dist.HTTPSDistributor(3, self.key)
+ [dist.insert(bridge) for bridge in self.bridges[:250]]
+
+ bridgeRequest = self.randomClientRequest()
+ responses = {}
+ for i in range(5):
+ responses[i] = dist.getBridges(bridgeRequest, 1)
+ for i in range(4):
+ self.assertItemsEqual(responses[i], responses[i+1])
+
def test_HTTPSDistributor_getBridges_ipv4_ipv6(self):
"""Asking for bridge addresses which are simultaneously IPv4 and IPv6
(in that order) should return IPv4 bridges.
1
0

[bridgedb/develop] Rewrite testDistWithFilterAll() and testDistWithFilterBoth() in legacy_Tests.
by isis@torproject.org 25 Jun '15
by isis@torproject.org 25 Jun '15
25 Jun '15
commit 6357566edb74341f84cc3f953ed34bbb1ce01247
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Tue Apr 21 23:33:42 2015 +0000
Rewrite testDistWithFilterAll() and testDistWithFilterBoth() in legacy_Tests.
---
lib/bridgedb/test/legacy_Tests.py | 35 ---------------------------
lib/bridgedb/test/test_Dist.py | 48 +++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py
index fc4ca5d..043f09b 100644
--- a/lib/bridgedb/test/legacy_Tests.py
+++ b/lib/bridgedb/test/legacy_Tests.py
@@ -268,41 +268,6 @@ class IPBridgeDistTests(unittest.TestCase):
assert type(ipaddr.IPAddress(address)) is ipaddr.IPv4Address
assert filterBridgesByIP4(random.choice(bridges))
- def testDistWithFilterBoth(self):
- d = bridgedb.Dist.HTTPSDistributor(3, "Foo")
- for _ in xrange(250):
- d.insert(fakeBridge6(or_addresses=True))
- d.insert(fakeBridge(or_addresses=True))
-
- for i in xrange(50):
- bridges = d.getBridges(randomIPv4String(),
- "faketimestamp",
- bridgeFilterRules=[
- filterBridgesByIP4,
- filterBridgesByIP6])
- if bridges:
- t = bridges.pop()
- assert filterBridgesByIP4(t)
- assert filterBridgesByIP6(t)
- address, portlist = networkstatus.parseALine(
- t.getConfigLine(addressClass=ipaddr.IPv4Address))
- assert type(address) is ipaddr.IPv4Address
- address, portlist = networkstatus.parseALine(
- t.getConfigLine(addressClass=ipaddr.IPv6Address))
- assert type(address) is ipaddr.IPv6Address
-
-
- def testDistWithFilterAll(self):
- d = bridgedb.Dist.HTTPSDistributor(3, "Foo")
- for _ in xrange(250):
- d.insert(fakeBridge6(or_addresses=True))
- d.insert(fakeBridge(or_addresses=True))
-
- for i in xrange(5):
- b = d.getBridges(randomIPv4String(), "x", bridgeFilterRules=[
- filterBridgesByIP4, filterBridgesByIP6])
- assert len(b) == 0
-
def testDistWithFilterBlockedCountriesAdvanced(self):
d = bridgedb.Dist.HTTPSDistributor(3, "Foo")
for _ in xrange(250):
diff --git a/lib/bridgedb/test/test_Dist.py b/lib/bridgedb/test/test_Dist.py
index 2d93a19..9e47a92 100644
--- a/lib/bridgedb/test/test_Dist.py
+++ b/lib/bridgedb/test/test_Dist.py
@@ -24,6 +24,8 @@ from bridgedb.bridges import Bridge
from bridgedb.bridges import PluggableTransport
from bridgedb.Bridges import BridgeRing
from bridgedb.Filters import filterBridgesByNotBlockedIn
+from bridgedb.Filters import filterBridgesByIP4
+from bridgedb.Filters import filterBridgesByIP6
from bridgedb.https.request import HTTPSBridgeRequest
from bridgedb.proxy import ProxySet
from bridgedb.test.util import randomHighPort
@@ -240,3 +242,49 @@ class HTTPSDistributorTests(unittest.TestCase):
self.assertFalse(b.isBlockedIn('ir'))
self.assertNotIn(b.fingerprint, blockedIR)
self.assertGreater(len(bridges), 0)
+
+ def test_HTTPSDistributor_getBridges_ipv4_ipv6(self):
+ """Asking for bridge addresses which are simultaneously IPv4 and IPv6
+ (in that order) should return IPv4 bridges.
+ """
+ dist = Dist.HTTPSDistributor(1, self.key)
+ [dist.insert(bridge) for bridge in self.bridges[:250]]
+
+ bridgeRequest = self.randomClientRequest()
+ bridgeRequest.withIPv4()
+ bridgeRequest.filters.append(filterBridgesByIP6)
+ bridgeRequest.generateFilters()
+
+ bridges = dist.getBridges(bridgeRequest, 1)
+ self.assertEqual(len(bridges), 3)
+
+ bridge = random.choice(bridges)
+ bridgeLine = bridge.getBridgeLine(bridgeRequest)
+ addrport, fingerprint = bridgeLine.split()
+ address, port = addrport.rsplit(':', 1)
+ address = address.strip('[]')
+ self.assertIsInstance(ipaddr.IPAddress(address), ipaddr.IPv4Address)
+ self.assertIsNotNone(filterBridgesByIP4(random.choice(bridges)))
+
+ def test_HTTPSDistributor_getBridges_ipv6_ipv4(self):
+ """Asking for bridge addresses which are simultaneously IPv6 and IPv4
+ (in that order) should return IPv6 bridges.
+ """
+ dist = Dist.HTTPSDistributor(1, self.key)
+ [dist.insert(bridge) for bridge in self.bridges[:250]]
+
+ bridgeRequest = self.randomClientRequest()
+ bridgeRequest.withIPv6()
+ bridgeRequest.generateFilters()
+ bridgeRequest.filters.append(filterBridgesByIP4)
+
+ bridges = dist.getBridges(bridgeRequest, 1)
+ self.assertEqual(len(bridges), 3)
+
+ bridge = random.choice(bridges)
+ bridgeLine = bridge.getBridgeLine(bridgeRequest)
+ addrport, fingerprint = bridgeLine.split()
+ address, port = addrport.rsplit(':', 1)
+ address = address.strip('[]')
+ self.assertIsInstance(ipaddr.IPAddress(address), ipaddr.IPv6Address)
+ self.assertIsNotNone(filterBridgesByIP6(random.choice(bridges)))
1
0