- tor-commits - lists.torproject.org

[tor/master] Remove redundant declarations of MIN
by nickm＠torproject.org 25 Apr '16

25 Apr '16

commit bff53aabce531d7786a7ce2d4dee818770d8d0cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 25 15:28:58 2016 -0400 Remove redundant declarations of MIN Apparently somewhere along the line we decided that MIN might be missing. But we already defined it (if it was missing) in compat.h, which everybody includes. Closes ticket 18889. --- changes/bug18889 | 2 ++ src/common/crypto.c | 2 -- src/or/circuitbuild.c | 4 ---- src/test/test-memwipe.c | 3 --- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/changes/bug18889 b/changes/bug18889 new file mode 100644 index 0000000..45b0992 --- /dev/null +++ b/changes/bug18889 @@ -0,0 +1,2 @@ + o Code simplification and refactoring: + - Remove redundant declarations of the MIN macro. Closes ticket 18889. diff --git a/src/common/crypto.c b/src/common/crypto.c index 7634887..65a575e 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2384,8 +2384,6 @@ tor_check_dh_key(int severity, BIGNUM *bn) return -1; } -#undef MIN -#define MIN(a,b) ((a)<(b)?(a):(b)) /** Given a DH key exchange object, and our peer's value of g^y (as a * pubkey_len-byte value in pubkey) generate * secret_bytes_out bytes of shared key material and write them diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index a5a933e..e6fe3f0 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -47,10 +47,6 @@ #include "routerset.h" #include "crypto.h" -#ifndef MIN -#define MIN(a,b) ((a)<(b)?(a):(b)) -#endif - static channel_t * channel_connect_for_circuit(const tor_addr_t *addr, uint16_t port, const char *id_digest); diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index 5d4fcec..5e89534 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -6,9 +6,6 @@ #include "crypto.h" #include "compat.h" -#undef MIN -#define MIN(a,b) ( ((a)<(b)) ? (a) : (b) ) - static unsigned fill_a_buffer_memset(void) __attribute__((noinline)); static unsigned fill_a_buffer_memwipe(void) __attribute__((noinline)); static unsigned fill_a_buffer_nothing(void) __attribute__((noinline));

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 25 Apr '16

25 Apr '16

commit f0f63d0c9328ec6c555b629c1f0c9d242a0cf99b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 25 16:15:29 2016 +0000 Update translations for tails-persistence-setup_completed --- de/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/de.po b/de/de.po index ed18c2c..cc66c88 100644 --- a/de/de.po +++ b/de/de.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-04-24 16:40+0200\n" -"PO-Revision-Date: 2016-04-25 15:34+0000\n" +"PO-Revision-Date: 2016-04-25 15:46+0000\n" "Last-Translator: Christian H. <christian.lehberger(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 25 Apr '16

25 Apr '16

commit 5aed7e4897bd9ece7e9b35407eca7328f3cd8fda Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 25 16:15:26 2016 +0000 Update translations for tails-persistence-setup --- de/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/de.po b/de/de.po index ed18c2c..cc66c88 100644 --- a/de/de.po +++ b/de/de.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-04-24 16:40+0200\n" -"PO-Revision-Date: 2016-04-25 15:34+0000\n" +"PO-Revision-Date: 2016-04-25 15:46+0000\n" "Last-Translator: Christian H. <christian.lehberger(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 25 Apr '16

25 Apr '16

commit 465b1c1a0611a355b2ae02902707ab0c8006e37b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 25 16:15:20 2016 +0000 Update translations for https_everywhere_completed --- zh_HK/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/https-everywhere.dtd b/zh_HK/https-everywhere.dtd index 5f57d96..701e015 100644 --- a/zh_HK/https-everywhere.dtd +++ b/zh_HK/https-everywhere.dtd @@ -7,7 +7,7 @@ <!ENTITY https-everywhere.about.librarians "規則管理員"> <!ENTITY https-everywhere.about.thanks "多謝"> <!ENTITY https-everywhere.about.many_contributors "貢獻者包括"> -<!ENTITY https-everywhere.about.noscript "並且，「https優先」有部份程式碼係Giorgio Maone同其他人由NoScript移植並修改而嚟，我哋非常地感謝佢哋嘅出色貢獻！"> +<!ENTITY https-everywhere.about.noscript "並且，「https優先」有部份程式碼係Giorgio Maone同其他人由NoScript移植並修改而嚟，我哋非常感謝佢哋嘅出色貢獻！"> <!ENTITY https-everywhere.about.contribute "若鍾意「https優先」，可考慮"> <!ENTITY https-everywhere.about.donate_tor "捐助Tor洋蔥路由"> <!ENTITY https-everywhere.about.tor_lang_code "zh-HK">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 25 Apr '16

25 Apr '16

commit 8c98366309b79d18861e0bbb7e7701bf051d8fe6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 25 16:15:15 2016 +0000 Update translations for https_everywhere --- zh_HK/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/https-everywhere.dtd b/zh_HK/https-everywhere.dtd index 5f57d96..701e015 100644 --- a/zh_HK/https-everywhere.dtd +++ b/zh_HK/https-everywhere.dtd @@ -7,7 +7,7 @@ <!ENTITY https-everywhere.about.librarians "規則管理員"> <!ENTITY https-everywhere.about.thanks "多謝"> <!ENTITY https-everywhere.about.many_contributors "貢獻者包括"> -<!ENTITY https-everywhere.about.noscript "並且，「https優先」有部份程式碼係Giorgio Maone同其他人由NoScript移植並修改而嚟，我哋非常地感謝佢哋嘅出色貢獻！"> +<!ENTITY https-everywhere.about.noscript "並且，「https優先」有部份程式碼係Giorgio Maone同其他人由NoScript移植並修改而嚟，我哋非常感謝佢哋嘅出色貢獻！"> <!ENTITY https-everywhere.about.contribute "若鍾意「https優先」，可考慮"> <!ENTITY https-everywhere.about.donate_tor "捐助Tor洋蔥路由"> <!ENTITY https-everywhere.about.tor_lang_code "zh-HK">

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 25 Apr '16

25 Apr '16

commit 7d16af8567c1f691908307269bac089f62e5d6a5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 25 15:45:52 2016 +0000 Update translations for tor-launcher-network-settings_completed --- de/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/network-settings.dtd b/de/network-settings.dtd index 96edf34..60d9edb 100644 --- a/de/network-settings.dtd +++ b/de/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren"> <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais"> <!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden können, ist es möglich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.  Dieses Problem kann meist mit der Benutzung von Torbrücken umgangen werden, das sind versteckte Relais und damit schwerer zu blocken."> -<!ENTITY torsettings.bridgeHelp1B "Sie können den vorkonfigurierten und bereitgestellten Satz an Brückenadressen verwenden, oder Sie können einen benutzerdefinierten Satz von Adressen, mit einer dieser drei Methoden erhalten:"> +<!ENTITY torsettings.bridgeHelp1B "Sie können den vorkonfigurierten Standardsatz von Brückenadressen benutzen oder Sie können einen angepassten Satz an Adresse mit Hilfe einer der folgenden Methoden erhalten:"> <!ENTITY torsettings.bridgeHelp2Heading "Durch das Internet"> <!ENTITY torsettings.bridgeHelp2 "Benutzen Sie einen Browser und besuchen Sie https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Durch die automatische E-Mail-Antwort">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 25 Apr '16

25 Apr '16

commit 54d894e1593767572e66f6cffa3985b2c840fd07 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 25 15:45:49 2016 +0000 Update translations for tor-launcher-network-settings --- de/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/network-settings.dtd b/de/network-settings.dtd index b2cc0c2..60d9edb 100644 --- a/de/network-settings.dtd +++ b/de/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren"> <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais"> <!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden können, ist es möglich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.  Dieses Problem kann meist mit der Benutzung von Torbrücken umgangen werden, das sind versteckte Relais und damit schwerer zu blocken."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "Sie können den vorkonfigurierten Standardsatz von Brückenadressen benutzen oder Sie können einen angepassten Satz an Adresse mit Hilfe einer der folgenden Methoden erhalten:"> <!ENTITY torsettings.bridgeHelp2Heading "Durch das Internet"> <!ENTITY torsettings.bridgeHelp2 "Benutzen Sie einen Browser und besuchen Sie https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Durch die automatische E-Mail-Antwort">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 25 Apr '16

25 Apr '16

commit 7cd9a106ec33b7588647d6cc470a103ab663c4cd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 25 15:45:43 2016 +0000 Update translations for tor-launcher-properties_completed --- de/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/de/torlauncher.properties b/de/torlauncher.properties index 20aa8b3..1b50aa5 100644 --- a/de/torlauncher.properties +++ b/de/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Beenden torlauncher.done=Fertig torlauncher.forAssistance=Falls Sie Hilfe benötigen, kontaktieren Sie %S +torlauncher.forAssistance2=Falls Sie Hilfe benötigen, kontaktieren Sie %S torlauncher.copiedNLogMessages=Kopie vollständig. %S Tor-Protokollnachrichten sind bereit, um in eine Textbearbeitung oder in eine E-Mail-Nachricht eingefügt zu werden.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 25 Apr '16

25 Apr '16

commit efb7ddd6c3ab620d4e435d05d78ab20bddf33807 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 25 15:45:39 2016 +0000 Update translations for tor-launcher-properties --- de/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torlauncher.properties b/de/torlauncher.properties index 39ee07a..1b50aa5 100644 --- a/de/torlauncher.properties +++ b/de/torlauncher.properties @@ -36,7 +36,7 @@ torlauncher.quit_win=Beenden torlauncher.done=Fertig torlauncher.forAssistance=Falls Sie Hilfe benötigen, kontaktieren Sie %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Falls Sie Hilfe benötigen, kontaktieren Sie %S torlauncher.copiedNLogMessages=Kopie vollständig. %S Tor-Protokollnachrichten sind bereit, um in eine Textbearbeitung oder in eine E-Mail-Nachricht eingefügt zu werden.

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 25 Apr '16

25 Apr '16

commit 08352313825d580aa21c42752388c1e159e1d1e5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 25 15:45:28 2016 +0000 Update translations for tails-persistence-setup_completed --- de/de.po | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/de/de.po b/de/de.po index 2f84b75..ed18c2c 100644 --- a/de/de.po +++ b/de/de.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christian H. <christian.lehberger(a)googlemail.com>, 2016 # Christian Seidel <dereagamer(a)yahoo.de>, 2015 # DoKnGH26" 21 <dokngh2621(a)gmail.com>, 2015 # Frank Anonima <frankano(a)yandex.com>, 2015 @@ -20,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-01-25 17:34+0100\n" -"PO-Revision-Date: 2016-03-21 16:32+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-04-24 16:40+0200\n" +"PO-Revision-Date: 2016-04-25 15:34+0000\n" +"Last-Translator: Christian H. <christian.lehberger(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -127,10 +128,18 @@ msgid "Lists downloaded by APT" msgstr "Listen, die von APT heruntergeladen wurden" #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 +msgid "Mumble server" +msgstr "Mumble-Server" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 +msgid "Mumble server configuration and its Tor Hidden Service address" +msgstr "Konfiguration des Mumble-Servers und seiner Tor Hidden Service Adresse" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:178 msgid "Dotfiles" msgstr "Dotfiles" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:180 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Alle Dateien und Verzeichnisse, die sich im »dotfiles«-Ordner befinden, mit dem Persönlichen Ordner verknüpfen"

1 0