February 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 21 Feb '18

21 Feb '18

commit 60d3a3c754b7d02e7fcb5e9cb6216fdd4062c3b2 Merge: 7e2e8ac24 ac1942ac5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 21 11:53:50 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 .gitmodules | 2 +- changes/ticket25323 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 21 Feb '18

21 Feb '18

commit 62c88a60111fa4bbd23cfe7bb604b827981cc81c Merge: fc22bcadb 8a5cb58ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 21 11:53:50 2018 -0500 Merge branch 'maint-0.3.3' .gitmodules | 2 +- changes/ticket25323 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 21 Feb '18

21 Feb '18

commit bcfb034957dbd5d891befcd99a9725a225903b4e Merge: bd71e0a0c ac1942ac5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 21 11:53:50 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 .gitmodules | 2 +- changes/ticket25323 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Update the .gitmodules to refer to project-level tor-rust-dependencies
by nickm＠torproject.org 21 Feb '18

21 Feb '18

commit ac1942ac58d631af036acc97c73dad9d89b23aaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 21 11:53:04 2018 -0500 Update the .gitmodules to refer to project-level tor-rust-dependencies Closes most of #25323. --- .gitmodules | 2 +- changes/ticket25323 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 7074403c9..8f8040565 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "src/ext/rust"] path = src/ext/rust - url = https://git.torproject.org/user/sebastian/tor-rust-dependencies + url = https://git.torproject.org/tor-rust-dependencies diff --git a/changes/ticket25323 b/changes/ticket25323 new file mode 100644 index 000000000..836825de5 --- /dev/null +++ b/changes/ticket25323 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Update the "rust dependencies" submodule to be an project-level + repository, rather than a user repository. Closes ticket 25323. +

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 21 Feb '18

21 Feb '18

commit 8a5cb58ad0b8e553d9df24aca02b0f8af5c0d47c Merge: 6384d314f bcfb03495 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 21 11:53:50 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 .gitmodules | 2 +- changes/ticket25323 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 21 Feb '18

21 Feb '18

commit 7c57495036cad643c323a86f421e23debfa21b6c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 21 14:45:25 2018 +0000 Update translations for whisperback --- sk/sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index 18db96a1f..f120dcdd4 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2018-02-20 18:43+0000\n" -"Last-Translator: Roman 'Kaktuxista' Benji <romanbeno273(a)gmail.com>\n" +"PO-Revision-Date: 2018-02-21 14:38+0000\n" +"Last-Translator: Robert Kirschner <robertkirschner(a)yahoo.com>\n" "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor/master] Revert 4438ef32's changes to test_address.c
by nickm＠torproject.org 21 Feb '18

21 Feb '18

commit fc22bcadb51bcabb9b9c16a9768adbe86788b7f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 21 09:35:48 2018 -0500 Revert 4438ef32's changes to test_address.c Apparently some versions of the mac sdk care about the ordering of net/if.h wrt other headers. Fixes bug 25319; bug not in any released tor. --- src/test/test_address.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 0dd7b4033..9c88d37a4 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -11,11 +11,8 @@ #include <iphlpapi.h> #endif -#ifdef HAVE_NET_IF_H -#include <net/if.h> -#endif - #ifdef HAVE_IFADDRS_TO_SMARTLIST +#include <net/if.h> #include <ifaddrs.h> #endif @@ -23,6 +20,7 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif +#include <net/if.h> #endif /* defined(HAVE_IFCONF_TO_SMARTLIST) */ #include "or.h"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 21 Feb '18

21 Feb '18

commit 3c67f2ef2fedb937ab382d2ca990183a8d742c28 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 21 11:17:06 2018 +0000 Update translations for tails-misc --- sv.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sv.po b/sv.po index 1d0dbfc9f..aa1350a76 100644 --- a/sv.po +++ b/sv.po @@ -9,6 +9,7 @@ # Filip Nyquist <fillerix(a)fillerix.se>, 2015 # Gabor Sebastiani, 2014 # Henrik Mattsson-Mårn <h(a)reglage.net>, 2017 +# Jacob Andersson <jacob.c.andersson(a)protonmail.com>, 2018 # falk3n <johan.falkenstrom(a)gmail.com>, 2014 # Jonatan Nyberg, 2017 # Jonatan Nyberg, 2017 @@ -23,7 +24,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-20 11:29+0100\n" -"PO-Revision-Date: 2018-02-21 10:46+0000\n" +"PO-Revision-Date: 2018-02-21 10:53+0000\n" "Last-Translator: Jacob Andersson <jacob.c.andersson(a)protonmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -240,7 +241,7 @@ msgstr "Både värdsystemet och virtualiseringsmjukvaran kan se allt du gör i T #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:76 msgid "Warning: non-free virtual machine detected!" -msgstr "Varning: virtuell maskin som inte är fri påträffad!" +msgstr "Varning: virtuell maskin som inte är fri upptäcktes!" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:78 msgid ""

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 21 Feb '18

21 Feb '18

commit 0db4dbaaa31b30d3eadd1ca313de7261b218fafe Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 21 10:47:07 2018 +0000 Update translations for tails-misc --- sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv.po b/sv.po index 7fc75e4d1..1d0dbfc9f 100644 --- a/sv.po +++ b/sv.po @@ -23,8 +23,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-20 11:29+0100\n" -"PO-Revision-Date: 2018-02-20 19:03+0000\n" -"Last-Translator: Henrik Mattsson-Mårn <h(a)reglage.net>\n" +"PO-Revision-Date: 2018-02-21 10:46+0000\n" +"Last-Translator: Jacob Andersson <jacob.c.andersson(a)protonmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor-browser-build/master] Bump build version
by gk＠torproject.org 21 Feb '18

21 Feb '18

commit 8bf3bb215393f78df81cf6a1ed3eeae6432f9f9b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 21 10:18:34 2018 +0000 Bump build version --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index b1ad4c4..83f35f6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0a1 project_name: tor-browser

1 0