[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0291b69ec61956ec528e30a102a428d5eac2405e
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 0291b69ec61956ec528e30a102a428d5eac2405e (commit) via 7547296f68260b578ce55650c86bb26282ab62be (commit) via 7c507f3d5bd855aa30ed4c11a2c43c0e42350ae3 (commit) via 5efe8957a553d024a95a1201672a0755b8084e39 (commit) via ef999913709afb81e647eff2f96a831a310c889b (commit) from 3198520570e962e4115315ffbec04c5eda9f552b (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 0291b69ec61956ec528e30a102a428d5eac2405e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 25 17:21:56 2020 +0000
Run "./make.sh lang"
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7547296f68260b578ce55650c86bb26282ab62be Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 4 22:29:14 2020 +0100
update translation files for changed Tor CGI strings
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7c507f3d5bd855aa30ed4c11a2c43c0e42350ae3 Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 4 22:28:50 2020 +0100
Tor: allow enforcing distinct Guard relays or countries
In order to make deanonymisation harder, especially high-risk Tor users might want to use certain Guard relays only (for example operated by people they trust), enforce Tor to use Guard relays in certain countries only (for example countries with very strict data protection laws or poor diplomatic relations), or avoid Guard relays in certain countries entirely.
Since Tor sticks to sampled Guards for a long time (usually within the range of months), restricting those is believed to cause less harm to a users' anonymity than restricting Exit relays, since their diversity of a generic Tor user is significantly higher.
This patch extends the Tor CGI for restricting Guard nodes to certain countries or relays matching certain fingerprints.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5efe8957a553d024a95a1201672a0755b8084e39 Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 4 22:28:22 2020 +0100
Tor: allow multiple countries to be selected for Exit relays
This extends the functionality of the Tor CGI in order to be able to select multiple countries for possible Exit relays, which is - in terms of anonymity - less worse than limiting all Tor circuits to a single country.
For example, a user might want to avoid Exit relays in more than one country, and permit Tor to use Exit relays elesewhere, and vice versa.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ef999913709afb81e647eff2f96a831a310c889b Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 25 17:15:17 2020 +0000
Tor: update to 0.4.4.6
Full changelog can be obtained from https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.4.4.6 .
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.de | 1 + doc/language_issues.en | 5 ++- doc/language_issues.es | 5 ++- doc/language_issues.fr | 3 ++ doc/language_issues.it | 3 ++ doc/language_issues.nl | 3 ++ doc/language_issues.pl | 5 ++- doc/language_issues.ru | 5 ++- doc/language_issues.tr | 3 ++ doc/language_missings | 28 ++++++++++++ html/cgi-bin/tor.cgi | 117 ++++++++++++++++++++++++++++++++++++++++++++++--- langs/de/cgi-bin/de.pl | 6 ++- langs/en/cgi-bin/en.pl | 6 ++- lfs/tor | 6 +-- 14 files changed, 180 insertions(+), 16 deletions(-)
Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index fd4dfc9d0..6d22fcea4 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -733,6 +733,7 @@ WARNING: translation string unused: tor accounting period daily WARNING: translation string unused: tor accounting period monthly WARNING: translation string unused: tor accounting period weekly WARNING: translation string unused: tor exit country +WARNING: translation string unused: tor guard country WARNING: translation string unused: traffic back WARNING: translation string unused: traffic calc time WARNING: translation string unused: traffic calc time bad diff --git a/doc/language_issues.en b/doc/language_issues.en index a95366cc5..b3c46de5e 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1716,6 +1716,8 @@ WARNING: untranslated string: tor errmsg invalid relay port = Invalid relay port WARNING: untranslated string: tor errmsg invalid socks port = Invalid SOCKS port WARNING: untranslated string: tor exit country any = Any country WARNING: untranslated string: tor exit nodes = Exit Nodes +WARNING: untranslated string: tor guard country any = Any country +WARNING: untranslated string: tor guard nodes = Guard Nodes WARNING: untranslated string: tor relay address = Relay address WARNING: untranslated string: tor relay configuration = Tor Relay Configuration WARNING: untranslated string: tor relay enabled = Enable Tor Relay @@ -1734,7 +1736,8 @@ WARNING: untranslated string: tor stats = Statistics WARNING: untranslated string: tor traffic limit hard = Traffic limit has been reached. WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reached. Not accepting any new connections. WARNING: untranslated string: tor traffic read written = Total traffic (read/written) -WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one per line) +WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line) +WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) WARNING: untranslated string: total connection time = Total Connection Time WARNING: untranslated string: total hits for log section = Total hits for log section WARNING: untranslated string: traffic on = Traffic on diff --git a/doc/language_issues.es b/doc/language_issues.es index a1adc2a0f..9f62f03f2 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1416,6 +1416,8 @@ WARNING: untranslated string: tor errmsg invalid relay port = Invalid relay port WARNING: untranslated string: tor errmsg invalid socks port = Invalid SOCKS port WARNING: untranslated string: tor exit country any = Any country WARNING: untranslated string: tor exit nodes = Exit Nodes +WARNING: untranslated string: tor guard country any = Any country +WARNING: untranslated string: tor guard nodes = Guard Nodes WARNING: untranslated string: tor relay address = Relay address WARNING: untranslated string: tor relay configuration = Tor Relay Configuration WARNING: untranslated string: tor relay enabled = Enable Tor Relay @@ -1434,7 +1436,8 @@ WARNING: untranslated string: tor stats = Statistics WARNING: untranslated string: tor traffic limit hard = Traffic limit has been reached. WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reached. Not accepting any new connections. WARNING: untranslated string: tor traffic read written = Total traffic (read/written) -WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one per line) +WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line) +WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: twelve hours = 12 Hours WARNING: untranslated string: two weeks = Two Weeks diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 2a8e5d5dc..90a745360 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -917,4 +917,7 @@ WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string +WARNING: untranslated string: tor guard country any = Any country +WARNING: untranslated string: tor guard nodes = Guard Nodes +WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) WARNING: untranslated string: whois results from = WHOIS results from diff --git a/doc/language_issues.it b/doc/language_issues.it index 4b9ac4b6c..62e4f9953 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1148,6 +1148,9 @@ WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 WARNING: untranslated string: tcp more reliable = TCP (more reliable) WARNING: untranslated string: ten minutes = 10 Minutes WARNING: untranslated string: thirty minutes = 30 Minutes +WARNING: untranslated string: tor guard country any = Any country +WARNING: untranslated string: tor guard nodes = Guard Nodes +WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: twelve hours = 12 Hours WARNING: untranslated string: two weeks = Two Weeks diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 84d7e13ee..9a767322e 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1187,6 +1187,9 @@ WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 WARNING: untranslated string: tcp more reliable = TCP (more reliable) WARNING: untranslated string: ten minutes = 10 Minutes WARNING: untranslated string: thirty minutes = 30 Minutes +WARNING: untranslated string: tor guard country any = Any country +WARNING: untranslated string: tor guard nodes = Guard Nodes +WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: twelve hours = 12 Hours WARNING: untranslated string: two weeks = Two Weeks diff --git a/doc/language_issues.pl b/doc/language_issues.pl index a1adc2a0f..9f62f03f2 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1416,6 +1416,8 @@ WARNING: untranslated string: tor errmsg invalid relay port = Invalid relay port WARNING: untranslated string: tor errmsg invalid socks port = Invalid SOCKS port WARNING: untranslated string: tor exit country any = Any country WARNING: untranslated string: tor exit nodes = Exit Nodes +WARNING: untranslated string: tor guard country any = Any country +WARNING: untranslated string: tor guard nodes = Guard Nodes WARNING: untranslated string: tor relay address = Relay address WARNING: untranslated string: tor relay configuration = Tor Relay Configuration WARNING: untranslated string: tor relay enabled = Enable Tor Relay @@ -1434,7 +1436,8 @@ WARNING: untranslated string: tor stats = Statistics WARNING: untranslated string: tor traffic limit hard = Traffic limit has been reached. WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reached. Not accepting any new connections. WARNING: untranslated string: tor traffic read written = Total traffic (read/written) -WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one per line) +WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line) +WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: twelve hours = 12 Hours WARNING: untranslated string: two weeks = Two Weeks diff --git a/doc/language_issues.ru b/doc/language_issues.ru index d6a788e05..5d16e0b18 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1409,6 +1409,8 @@ WARNING: untranslated string: tor errmsg invalid relay port = Invalid relay port WARNING: untranslated string: tor errmsg invalid socks port = Invalid SOCKS port WARNING: untranslated string: tor exit country any = Any country WARNING: untranslated string: tor exit nodes = Exit Nodes +WARNING: untranslated string: tor guard country any = Any country +WARNING: untranslated string: tor guard nodes = Guard Nodes WARNING: untranslated string: tor relay address = Relay address WARNING: untranslated string: tor relay configuration = Tor Relay Configuration WARNING: untranslated string: tor relay enabled = Enable Tor Relay @@ -1427,7 +1429,8 @@ WARNING: untranslated string: tor stats = Statistics WARNING: untranslated string: tor traffic limit hard = Traffic limit has been reached. WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reached. Not accepting any new connections. WARNING: untranslated string: tor traffic read written = Total traffic (read/written) -WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one per line) +WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line) +WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: twelve hours = 12 Hours WARNING: untranslated string: two weeks = Two Weeks diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 88cca7fcf..26530a923 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1047,6 +1047,9 @@ WARNING: untranslated string: strict = Strict WARNING: untranslated string: subnet mask = Subnet Mask WARNING: untranslated string: system is offline = The system is offline. WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 +WARNING: untranslated string: tor guard country any = Any country +WARNING: untranslated string: tor guard nodes = Guard Nodes +WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: update ruleset = Update ruleset WARNING: untranslated string: user management = User Management diff --git a/doc/language_missings b/doc/language_missings index 6be2a471d..12e341402 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -816,6 +816,9 @@ < tor exit country < tor exit country any < tor exit nodes +< tor guard country +< tor guard country any +< tor guard nodes < tor relay address < tor relay configuration < tor relay enabled @@ -835,6 +838,7 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< tor use guard nodes < transport mode does not support vti < twelve hours < two weeks @@ -963,6 +967,10 @@ < g.lite < ip basic info < ip info for +< tor guard country +< tor guard country any +< tor guard nodes +< tor use guard nodes < upload fcdsl.o < whois results from ############################################################################ @@ -1268,6 +1276,10 @@ < tcp more reliable < ten minutes < thirty minutes +< tor guard country +< tor guard country any +< tor guard nodes +< tor use guard nodes < transport mode does not support vti < twelve hours < two weeks @@ -1697,6 +1709,10 @@ < ten minutes < teovpn_fragment < thirty minutes +< tor guard country +< tor guard country any +< tor guard nodes +< tor use guard nodes < transport mode does not support vti < twelve hours < two weeks @@ -2508,6 +2524,9 @@ < tor exit country < tor exit country any < tor exit nodes +< tor guard country +< tor guard country any +< tor guard nodes < tor relay address < tor relay configuration < tor relay enabled @@ -2527,6 +2546,7 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< tor use guard nodes < transport mode does not support vti < twelve hours < two weeks @@ -3384,6 +3404,9 @@ < tor exit country < tor exit country any < tor exit nodes +< tor guard country +< tor guard country any +< tor guard nodes < tor relay address < tor relay configuration < tor relay enabled @@ -3403,6 +3426,7 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< tor use guard nodes < transport mode does not support vti < twelve hours < two weeks @@ -3665,6 +3689,10 @@ < subnet mask < system is offline < taa zombieload2 +< tor guard country +< tor guard country any +< tor guard nodes +< tor use guard nodes < transport mode does not support vti < update ruleset < user management diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index 983bb30c9..fe91ed399 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -96,6 +96,8 @@ $settings{'TOR_ENABLED'} = 'off'; $settings{'TOR_SOCKS_PORT'} = 9050; $settings{'TOR_EXIT_COUNTRY'} = ''; $settings{'TOR_USE_EXIT_NODES'} = ''; +$settings{'TOR_GUARD_COUNTRY'} = ''; +$settings{'TOR_USE_GUARD_NODES'} = ''; $settings{'TOR_ALLOWED_SUBNETS'} = "$netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'}"; if (&Header::blue_used()) { $settings{'TOR_ALLOWED_SUBNETS'} .= ",$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}"; @@ -178,6 +180,15 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { } }
+ @temp = split(/[\n,]/,$settings{'TOR_USE_GUARD_NODES'}); + $settings{'TOR_USE_GUARD_NODES'} = ""; + foreach (@temp) { + s/^\s+//g; s/\s+$//g; + if ($_) { + $settings{'TOR_USE_GUARD_NODES'} .= $_.","; + } + } + # Burst bandwidth must be less or equal to bandwidth rate. if ($settings{'TOR_RELAY_BANDWIDTH_RATE'} == 0) { $settings{'TOR_RELAY_BANDWIDTH_BURST'} = 0; @@ -281,6 +292,9 @@ END @temp = split(",", $settings{'TOR_USE_EXIT_NODES'}); $settings{'TOR_USE_EXIT_NODES'} = join("\n", @temp);
+ @temp = split(",", $settings{'TOR_USE_GUARD_NODES'}); + $settings{'TOR_USE_GUARD_NODES'} = join("\n", @temp); + print <<END; <br> <br> @@ -303,8 +317,57 @@ END </tr> </table>
- <br> - <br> + <br /> + <br /> + + <table width='95%'> + <tr> + <td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor guard nodes'}</b></td> + </tr> + <tr> + <td colspan='2' class='base' width='55%'></td> + <td colspan='2' class='base' width='45%'>$Lang::tr{'tor use guard nodes'}:</td> + </tr> + <tr> + <td width='50%' colspan='2'> + <select name='TOR_GUARD_COUNTRY' multiple='multiple'> + <option value=''>- $Lang::tr{'tor guard country any'} -</option> +END + + # Convert Guard country strings into lists to make comparison easier + my @guard_countries; + if ($settings{'TOR_GUARD_COUNTRY'} ne '') { + @guard_countries = split(/|/, $settings{'TOR_GUARD_COUNTRY'}); + } + + my @country_codes = &Location::database_countries($db_handle); + foreach my $country_code (@country_codes) { + # Convert country code into upper case format. + $country_code = uc($country_code); + + # Get country name. + my $country_name = &Location::Functions::get_full_country_name($country_code); + + print "<option value='$country_code'"; + + if ($settings{'TOR_GUARD_COUNTRY'} ne '') { + print " selected" if grep /$country_code/, @guard_countries; + } + + print ">$country_name ($country_code)</option>\n"; + } + + print <<END; + </select> + </td> + <td width='50%' colspan='2'> + <textarea name='TOR_USE_GUARD_NODES' cols='32' rows='3' wrap='off'>$settings{'TOR_USE_GUARD_NODES'}</textarea> + </td> + </tr> + </table> + + <br /> + <br />
<table width='95%'> <tr> @@ -316,10 +379,17 @@ END </tr> <tr> <td width='50%' colspan='2'> - <select name='TOR_EXIT_COUNTRY'> + <select name='TOR_EXIT_COUNTRY' multiple='multiple'> <option value=''>- $Lang::tr{'tor exit country any'} -</option> END my @country_codes = &Location::Functions::get_locations("no_special_locations"); + + # Convert Exit country strings into lists to make comparison easier + my @exit_countries; + if ($settings{'TOR_EXIT_COUNTRY'} ne '') { + @exit_countries = split(/|/, $settings{'TOR_EXIT_COUNTRY'}); + } + foreach my $country_code (@country_codes) { # Convert country code into upper case format. $country_code = uc($country_code); @@ -329,8 +399,8 @@ END
print "<option value='$country_code'";
- if ($settings{'TOR_EXIT_COUNTRY'} eq $country_code) { - print " selected"; + if ($settings{'TOR_EXIT_COUNTRY'} ne '') { + print " selected" if grep /$country_code/, @exit_countries; }
print ">$country_name ($country_code)</option>\n"; @@ -673,10 +743,43 @@ sub BuildConfiguration() { } print FILE "SocksPolicy reject *\n" if (@subnets);
+ if ($settings{'TOR_GUARD_COUNTRY'} ne '') { + $strict_nodes = 1; + my $countrylist; + + for my $singlecountry (split(/|/, $settings{'TOR_GUARD_COUNTRY'})) { + if ($countrylist eq '') { + $countrylist = "{" . lc $singlecountry . "}"; + } else { + $countrylist = $countrylist . "," . "{" . lc $singlecountry . "}"; + } + } + + print FILE "EntryNodes $countrylist\n"; + } + + if ($settings{'TOR_USE_GUARD_NODES'} ne '') { + $strict_nodes = 1; + + my @nodes = split(",", $settings{'TOR_USE_GUARD_NODES'}); + foreach (@nodes) { + print FILE "EntryNode $_\n"; + } + } + if ($settings{'TOR_EXIT_COUNTRY'} ne '') { $strict_nodes = 1; + my $countrylist; + + for my $singlecountry (split(/|/, $settings{'TOR_EXIT_COUNTRY'})) { + if ($countrylist eq '') { + $countrylist = "{" . lc $singlecountry . "}"; + } else { + $countrylist = $countrylist . "," . "{" . lc $singlecountry . "}"; + } + }
- print FILE "ExitNodes {$settings{'TOR_EXIT_COUNTRY'}}\n"; + print FILE "ExitNodes $countrylist\n"; }
if ($settings{'TOR_USE_EXIT_NODES'} ne '') { diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index afd7b9522..2fb46e741 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2409,6 +2409,9 @@ 'tor exit country' => 'Exit-Land', 'tor exit country any' => 'Beliebig', 'tor exit nodes' => 'Exitknoten', +'tor guard country' => 'Guard-Land', +'tor guard country any' => 'Beliebig', +'tor guard nodes' => 'Guardknoten', 'tor relay address' => 'Relais-Adresse', 'tor relay configuration' => 'Tor-Relais-Konfiguration', 'tor relay enabled' => 'Tor-Relais einschalten', @@ -2427,7 +2430,8 @@ 'tor traffic limit hard' => 'Das Übertragungslimit wurde erreicht.', 'tor traffic limit soft' => 'Das Übertragungslimit wurde fast erreicht. Es werden keine neuen Verbindungen akzeptiert.', 'tor traffic read written' => 'Gesamter Traffic (empfangen/gesendet)', -'tor use exit nodes' => 'Nur diese Exitknoten benutzen (einer pro Zeile)', +'tor use exit nodes' => 'Nur diese Exitknoten benutzen (ein Fingerabdruck pro Zeile)', +'tor use guard nodes' => 'Nur diese Guardknoten benutzen (ein Fingerabdruck pro Zeile)', 'total connection time' => 'Gesammte Verbindungszeit', 'total hits for log section' => 'Gesamte Treffer für Protokollsektion', 'traffic back' => 'Zurück', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 6a97ee8fc..b5284effa 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2450,6 +2450,9 @@ 'tor exit country' => 'Exit country', 'tor exit country any' => 'Any country', 'tor exit nodes' => 'Exit Nodes', +'tor guard country' => 'Guard country', +'tor guard country any' => 'Any country', +'tor guard nodes' => 'Guard Nodes', 'tor relay address' => 'Relay address', 'tor relay configuration' => 'Tor Relay Configuration', 'tor relay enabled' => 'Enable Tor Relay', @@ -2468,7 +2471,8 @@ 'tor traffic limit hard' => 'Traffic limit has been reached.', 'tor traffic limit soft' => 'Traffic limit almost reached. Not accepting any new connections.', 'tor traffic read written' => 'Total traffic (read/written)', -'tor use exit nodes' => 'Use only these exit nodes (one per line)', +'tor use exit nodes' => 'Use only these exit nodes (one fingerprint per line)', +'tor use guard nodes' => 'Use only these guard nodes (one fingerprint per line)', 'total connection time' => 'Total Connection Time', 'total hits for log section' => 'Total hits for log section', 'traffic back' => 'Back', diff --git a/lfs/tor b/lfs/tor index b7c28495d..6d758dcb0 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@
include Config
-VER = 0.4.4.5 +VER = 0.4.4.6
THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 55 +PAK_VER = 56
DEPS = libseccomp
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b061b7c4ce6102fb7c800b73c8573388 +$(DL_FILE)_MD5 = 3635b2f7b6645910bf702ce8eaeffd0d
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer