tor-commits January 2016

tor-commits@lists.torproject.org

19 participants
1449 discussions

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 07 Jan '16

07 Jan '16

commit 07277cba066219ed604593d6ec9a16ffda82d22e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 7 20:15:14 2016 +0000 Update translations for bridgedb_completed --- tr/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index e8bfdaf..23e2737 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-04 17:11+0000\n" +"PO-Revision-Date: 2016-01-07 20:14+0000\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgstr "Şimdi %s köprüleri Tor Browser'a ekleyin %s" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sB%sana yalnız köprüleri verin!" +msgstr "%sB%sana sadece köprüleri verin!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -200,12 +200,12 @@ msgstr "KOMUTlar: (birden fazla seçeneğı aynı anda belirtmek için KOMUTlar #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" -msgstr "BridgeDB'ye hoş geldiniz!" +msgstr "BridgeDB'ye Hoş Geldiniz!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "Şu an desteklenen aktarım TİPleri:" +msgstr "Şu an desteklenen aktarım TÜRleri:" #: bridgedb/strings.py:56 #, python-format @@ -273,7 +273,7 @@ msgstr "Köprü nedir?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Köprüler %s Internet kısıtlamalarını aşmanıza yardımcı olan Tor aktarıcılarıdır." +msgstr "%s Köprüler %s İnternet kısıtlamalarını aşmanıza yardımcı olan Tor aktarıcılarıdır." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 07 Jan '16

07 Jan '16

commit f7837ab29918638d516dbc8420d300720e7c4083 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 7 20:15:03 2016 +0000 Update translations for bridgedb --- tr/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index e8bfdaf..23e2737 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-04 17:11+0000\n" +"PO-Revision-Date: 2016-01-07 20:14+0000\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgstr "Şimdi %s köprüleri Tor Browser'a ekleyin %s" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sB%sana yalnız köprüleri verin!" +msgstr "%sB%sana sadece köprüleri verin!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -200,12 +200,12 @@ msgstr "KOMUTlar: (birden fazla seçeneğı aynı anda belirtmek için KOMUTlar #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" -msgstr "BridgeDB'ye hoş geldiniz!" +msgstr "BridgeDB'ye Hoş Geldiniz!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "Şu an desteklenen aktarım TİPleri:" +msgstr "Şu an desteklenen aktarım TÜRleri:" #: bridgedb/strings.py:56 #, python-format @@ -273,7 +273,7 @@ msgstr "Köprü nedir?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Köprüler %s Internet kısıtlamalarını aşmanıza yardımcı olan Tor aktarıcılarıdır." +msgstr "%s Köprüler %s İnternet kısıtlamalarını aşmanıza yardımcı olan Tor aktarıcılarıdır." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!"

1 0

[tor/master] Fix #18012 harder.
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 62bc4a199a975a5cfe3891a59a0161f22906df1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:58:48 2016 -0800 Fix #18012 harder. --- src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fd711a2..863105f 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4676,7 +4676,7 @@ test_util_pwdb(void *arg) #ifdef _WIN32 #define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL } #define UTIL_TEST_WIN_ONLY(n, f) UTIL_TEST(n, (f)) -#define UTIL_LEGACY_NO_WIN(n) UTIL_TEST_NO_WIN(n) +#define UTIL_LEGACY_NO_WIN(n) UTIL_TEST_NO_WIN(n, 0) #else #define UTIL_TEST_NO_WIN(n, f) UTIL_TEST(n, (f)) #define UTIL_TEST_WIN_ONLY(n, f) { #n, NULL, TT_SKIP, NULL, NULL }

1 0

[tor/master] Merge remote-tracking branch 'public/17826_redux'
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 77bc95cb5ea7539e51b0c5bc2db8684edcdbd85b Merge: 55232e3 263f6d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:52:09 2016 -0800 Merge remote-tracking branch 'public/17826_redux' changes/17826 | 5 +++++ src/common/include.am | 5 ++++- src/or/include.am | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/master] Mark all object files built based on micro-revision.i as depending on it
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 263f6d11fdbb665b026e3dc2d8e7260475c3ff4b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Dec 26 13:43:13 2015 -0500 Mark all object files built based on micro-revision.i as depending on it Fixes make -j for some users; fixes bug 17826. Bugfix on 0.2.5.1, when we started building testing versions of all the object files. --- changes/17826 | 5 +++++ src/common/include.am | 5 ++++- src/or/include.am | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/17826 b/changes/17826 new file mode 100644 index 0000000..7d0a17a --- /dev/null +++ b/changes/17826 @@ -0,0 +1,5 @@ + o Minor bugfixes (build): + - Mark all object files that include micro-revision.i as depending on + it, so as to make our build more reliable with parallel builds. + Fixes bug 17826; bugfix on 0.2.5.1-alpha. + diff --git a/src/common/include.am b/src/common/include.am index 2fc92e2..d82c093 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -78,7 +78,10 @@ LIBOR_A_SOURCES = \ $(threads_impl_source) \ $(readpassphrase_source) -src/common/log.o: micro-revision.i +src/common/src_common_libor_testing_a-log.o \ + src/common/src_common_libor_testing_a-log.obj \ + src/common/log.o \ + src/common/log.obj : micro-revision.i LIBOR_CRYPTO_A_SOURCES = \ src/common/aes.c \ diff --git a/src/or/include.am b/src/or/include.am index dab0048..14ad05b 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -93,7 +93,10 @@ src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) src_or_tor_SOURCES = src/or/tor_main.c AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or -src/or/tor_main.o: micro-revision.i +src/or/tor_main.o \ + src/or/tor_main.obj \ + src/or/src_or_tor_cov-tor_main.o \ + src/or/src_or_tor_cov-tor_main.obj : micro-revision.i AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit b0474572de5b9556144410a496e043eaa67f5ed9 Merge: 9d12bda b34c5c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:48:07 2016 -0800 Merge branch 'maint-0.2.7' into release-0.2.7 changes/bug17675 | 4 + changes/bug17906 | 4 + changes/bug17923 | 4 + changes/geoip-january2016 | 4 + configure.ac | 1 - src/config/geoip | 1734 +++++++++++++++++++++++++++++++++++---------- src/config/geoip6 | 881 +++++++++++++++++------ src/or/config.c | 2 +- src/or/main.c | 3 + 9 files changed, 2032 insertions(+), 605 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit b34c5c6b8ac0d13d5e2bda188ff038f6ff7eb4f3 Merge: d9b11d0 c7b0cd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:43:12 2016 -0800 Merge branch 'maint-0.2.6' into maint-0.2.7 Conflicts: src/or/config.c changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/or/config.c index fa860af,7444af6..3b35b5a --- a/src/or/config.c +++ b/src/or/config.c @@@ -857,41 -841,6 +857,41 @@@ escaped_safe_str(const char *address return escaped(address); } +/** List of default directory authorities */ + +static const char *default_authorities[] = { + "moria1 orport=9101 " + "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " + "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", + "tor26 orport=443 " + "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " + "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", + "dizum orport=443 " + "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " + "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", + "Tonga orport=443 bridge " + "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", + "gabelmoo orport=443 " + "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "dannenberg orport=443 " - "v3ident=585769C78764D58426B8B52B6651A5A71137189A " ++ "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " + "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", + "urras orport=80 " + "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", + "maatuska orport=80 " + "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", + "Faravahar orport=443 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", + "longclaw orport=443 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", + NULL +}; + /** Add the default directory authorities directly into the trusted dir list, * but only add them insofar as they share bits with <b>type</b>. * Each authority's bits are restricted to the bits shared with <b>type</b>.

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 9ca329581af71c9aa6890b63c29c6a51ac37e408 Merge: ae22313 11f63d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:40:23 2016 -0800 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/or/config.c index 2a7237d,1610cad..60d3d7f --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Tonga orport=443 bridge no-v2 82.94.251.203:80 " + "Tonga orport=443 bridge 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "gabelmoo orport=443 no-v2 " + "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 no-v2 " + "dannenberg orport=443 " - "v3ident=585769C78764D58426B8B52B6651A5A71137189A " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", - "maatuska orport=80 no-v2 " + "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 no-v2 " + "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 no-v2 " + "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit c7b0cd9c2f52ca289515833060ac0b8461da2225 Merge: 400df18 9ca3295 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:41:36 2016 -0800 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/or/config.c index fca350c,60d3d7f..7444af6 --- a/src/or/config.c +++ b/src/or/config.c @@@ -865,10 -862,9 +865,10 @@@ add_default_trusted_dir_authorities(dir "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 " - "v3ident=585769C78764D58426B8B52B6651A5A71137189A " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "urras orport=80 " + "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "

1 0

[tor/release-0.2.7] Update dannenberg's V3 authority identity fingerprint
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 11f63d26acb8ca872d894fb1423b380dc1f8dc2e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Dec 21 10:40:10 2015 +1100 Update dannenberg's V3 authority identity fingerprint This new identity key was changed on 18 November 2015. --- changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug17906 b/changes/bug17906 new file mode 100644 index 0000000..fff76d1 --- /dev/null +++ b/changes/bug17906 @@ -0,0 +1,4 @@ + o Minor features (authorities): + - Update the V3 identity key for dannenberg, it was changed on + 18 November 2015. + Closes task #17906. Patch by "teor". diff --git a/src/or/config.c b/src/or/config.c index fde88ad..1610cad 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -800,7 +800,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 no-v2 " - "v3ident=585769C78764D58426B8B52B6651A5A71137189A " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2016