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

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 24 Jan '18

24 Jan '18

commit 03a7f36a9a6c10b61f9efe8562af05585f95396c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 24 21:46:01 2018 +0000 Update translations for tails-persistence-setup --- eu/eu.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu/eu.po b/eu/eu.po index 8fabd4b0d..152b8e8f0 100644 --- a/eu/eu.po +++ b/eu/eu.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-10-05 13:45+0000\n" +"PO-Revision-Date: 2018-01-24 21:39+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n" "MIME-Version: 1.0\n"

1 0

[rbm/master] Bug 25004: rename abbrev_lenght to abbrev_length
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit b83c74ca4b91732f64011f0255a1594f7747b340 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 24 17:34:49 2018 +0100 Bug 25004: rename abbrev_lenght to abbrev_length --- NEWS | 2 +- doc/options_misc.asc | 4 ++-- lib/RBM/DefaultConfig.pm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index d517840..256cad9 100644 --- a/NEWS +++ b/NEWS @@ -39,7 +39,7 @@ - Add support for external input files, documented in burps_input_files(7) -- Add the abbrev and abbrev_lenght options +- Add the abbrev and abbrev_length options - Add the tar option, to create deterministic tar files diff --git a/doc/options_misc.asc b/doc/options_misc.asc index 3b3b877..876768b 100644 --- a/doc/options_misc.asc +++ b/doc/options_misc.asc @@ -17,8 +17,8 @@ abbrev:: This option returns the abbreviated commit hash of the +git_hash+ or +hg_hash+ commit. -abbrev_lenght:: - This option sets the lenght of the abbreviated commits, when +abbrev_length:: + This option sets the length of the abbreviated commits, when using the +abbrev+ option. tar:: diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index d0d893a..4121264 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -129,10 +129,10 @@ our %default_config = ( build_log_append => '1', notmpl => [ qw(projects_dir) ], describe => \&git_describe, - abbrev_lenght => '12', + abbrev_length => '12', abbrev => '[% IF c("git_url"); - exec("git log -1 --abbrev=" _ c("abbrev_lenght") _ " --format=%h " _ c("git_hash")); + exec("git log -1 --abbrev=" _ c("abbrev_length") _ " --format=%h " _ c("git_hash")); ELSE; exec(c("hg") _ " id -i -r " _ c("hg_hash")); END;

1 0

[rbm/master] Bug 24982: add script to help updating the website
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit 213fad5a8fe04272359c33778626a2802efc4ebc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 23 19:01:13 2018 +0100 Bug 24982: add script to help updating the website This script will create a tarball containing the website and print commands that can be used to upload it. --- doc/make-rbm-docs-tar.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/make-rbm-docs-tar.sh b/doc/make-rbm-docs-tar.sh new file mode 100755 index 0000000..5a1b576 --- /dev/null +++ b/doc/make-rbm-docs-tar.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +docsdir=$(pwd) +tmpdir=$(mktemp -d) +make clean +make install-web webdir="$tmpdir" +cd "$tmpdir" +chmod 664 * +tar -cf "$docsdir"/rbm-docs.tar * +cd - +rm -Rf "$tmpdir" +echo "You can now update the web site with:" +echo " ssh staticiforme.torproject.org tar --overwrite -p -C /srv/rbm-master.torproject.org/htdocs -xf - < rbm-docs.tar" +echo " ssh staticiforme.torproject.org static-update-component rbm.torproject.org"

1 0

[rbm/master] Bug 24982: update url in README.md
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit 0eb1f12241ed067ef9c013ef0f72e9cca89ee5e6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 23 19:00:40 2018 +0100 Bug 24982: update url in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b6862d..e3ab848 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,5 @@ to allow reproducing the build. For more information, visit the website : - https://people.torproject.org/~boklm/rbm/ + https://rbm.torproject.org/

1 0

[tor/master] Fix a memory leak in scheduler/loop_kist
by nickm＠torproject.org 24 Jan '18

24 Jan '18

commit 6ba2881aec7299fb486ab0f821c4f2ddcc88190e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 24 12:07:45 2018 -0500 Fix a memory leak in scheduler/loop_kist Fixes bug 25005. --- changes/bug25005 | 4 ++++ src/test/test_scheduler.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug25005 b/changes/bug25005 new file mode 100644 index 000000000..dedf283aa --- /dev/null +++ b/changes/bug25005 @@ -0,0 +1,4 @@ + o Minor bugfixes (unit tests): + - Fix a memory leak in the scheduler/loop_kist unit test. Fixes bug + 25005; bugfix on 0.3.2.7-rc. + diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index 63add2f38..18f989514 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -864,6 +864,7 @@ test_scheduler_loop_kist(void *arg) tt_assert(ch3); ch3->magic = TLS_CHAN_MAGIC; ch3->state = CHANNEL_STATE_OPEN; + circuitmux_free(ch3->cmux); ch3->cmux = circuitmux_alloc(); channel_register(ch3); tt_assert(ch3->registered);

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 24 Jan '18

24 Jan '18

commit 677bebda7005ca9df960a4691c58f2cebb05035f Merge: 03eb2037d 6ba2881ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 24 12:09:07 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25005 | 4 ++++ src/test/test_scheduler.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/master] Fix a memory leak in build_unopened_fourhop
by nickm＠torproject.org 24 Jan '18

24 Jan '18

commit 2484d1eb35d9a54d0e417466148c8480a4816ab7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 24 12:08:39 2018 -0500 Fix a memory leak in build_unopened_fourhop This is a unit-test-only leak, but let's fix it anyway so it doesn't hide real bugs. Bug not in any released version of Tor. --- src/test/test_circuitstats.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_circuitstats.c b/src/test/test_circuitstats.c index 9d87c325b..8ebef659c 100644 --- a/src/test/test_circuitstats.c +++ b/src/test/test_circuitstats.c @@ -82,6 +82,8 @@ build_unopened_fourhop(struct timeval circ_start_time) onion_append_hop(&or_circ->cpath, fakehop); onion_append_hop(&or_circ->cpath, fakehop); + tor_free(fakehop); + return or_circ; }

1 0

[tor/release-0.3.2] Fix a memory leak in scheduler/loop_kist
by nickm＠torproject.org 24 Jan '18

24 Jan '18

commit 6ba2881aec7299fb486ab0f821c4f2ddcc88190e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 24 12:07:45 2018 -0500 Fix a memory leak in scheduler/loop_kist Fixes bug 25005. --- changes/bug25005 | 4 ++++ src/test/test_scheduler.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug25005 b/changes/bug25005 new file mode 100644 index 000000000..dedf283aa --- /dev/null +++ b/changes/bug25005 @@ -0,0 +1,4 @@ + o Minor bugfixes (unit tests): + - Fix a memory leak in the scheduler/loop_kist unit test. Fixes bug + 25005; bugfix on 0.3.2.7-rc. + diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index 63add2f38..18f989514 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -864,6 +864,7 @@ test_scheduler_loop_kist(void *arg) tt_assert(ch3); ch3->magic = TLS_CHAN_MAGIC; ch3->state = CHANNEL_STATE_OPEN; + circuitmux_free(ch3->cmux); ch3->cmux = circuitmux_alloc(); channel_register(ch3); tt_assert(ch3->registered);

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 24 Jan '18

24 Jan '18

commit fd8ee1d7c335a02a6fd29cd1a826037efe28e100 Merge: 2484d1eb3 6ba2881ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 24 12:09:07 2018 -0500 Merge branch 'maint-0.3.2' changes/bug25005 | 4 ++++ src/test/test_scheduler.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/maint-0.3.2] Fix a memory leak in scheduler/loop_kist
by nickm＠torproject.org 24 Jan '18

24 Jan '18

commit 6ba2881aec7299fb486ab0f821c4f2ddcc88190e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 24 12:07:45 2018 -0500 Fix a memory leak in scheduler/loop_kist Fixes bug 25005. --- changes/bug25005 | 4 ++++ src/test/test_scheduler.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug25005 b/changes/bug25005 new file mode 100644 index 000000000..dedf283aa --- /dev/null +++ b/changes/bug25005 @@ -0,0 +1,4 @@ + o Minor bugfixes (unit tests): + - Fix a memory leak in the scheduler/loop_kist unit test. Fixes bug + 25005; bugfix on 0.3.2.7-rc. + diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index 63add2f38..18f989514 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -864,6 +864,7 @@ test_scheduler_loop_kist(void *arg) tt_assert(ch3); ch3->magic = TLS_CHAN_MAGIC; ch3->state = CHANNEL_STATE_OPEN; + circuitmux_free(ch3->cmux); ch3->cmux = circuitmux_alloc(); channel_register(ch3); tt_assert(ch3->registered);

1 0