May 2014 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 01 May '14

01 May '14

commit 14bc6e8993c694702f5ab637c36b962f396660a5 Merge: efab348 6a4f5d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 11:44:25 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/or/microdesc.c changes/bug7164_downgrade | 6 ++++++ src/or/microdesc.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --cc src/or/microdesc.c index 90ac0ac,4acec6a..0e72c0b --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@@ -614,13 -561,11 +614,13 @@@ microdesc_free_(microdesc_t *md, const } }); if (found) { - log_warn(LD_BUG, "microdesc_free() called from %s:%d, but md was still " - log_info(LD_BUG, "microdesc_free() called, but md was still referenced " - "%d node(s); held_by_nodes == %u", found, md->held_by_nodes); ++ log_info(LD_BUG, "microdesc_free() called from %s:%d, but md was still " + "referenced %d node(s); held_by_nodes == %u", + fname, lineno, found, md->held_by_nodes); } else { - log_warn(LD_BUG, "microdesc_free() called with held_by_nodes set to %u, " - "but md was not referenced by any nodes", md->held_by_nodes); + log_warn(LD_BUG, "microdesc_free() called from %s:%d with held_by_nodes " + "set to %u, but md was not referenced by any nodes", + fname, lineno, md->held_by_nodes); } tor_fragile_assert(); }

1 0

[tor/maint-0.2.3] Downgrade bug 7164 warning to INFO
by nickm＠torproject.org 01 May '14

01 May '14

commit 6a4f5d9b4df1d05d1b158417cfcc85a547ad1549 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 11:42:02 2014 -0400 Downgrade bug 7164 warning to INFO The 0.2.5.x warning is the one that might help us track this down; the warnings in stable are just annoying users over and over and over. --- changes/bug7164_downgrade | 6 ++++++ src/or/microdesc.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug7164_downgrade b/changes/bug7164_downgrade new file mode 100644 index 0000000..4d75586 --- /dev/null +++ b/changes/bug7164_downgrade @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Downgrade the warning severity for the the "md was still referenced 1 + node(s)" warning. Tor 0.2.5.4-alpha has better code for trying to + diagnose this bug, and the current warning in earlier versions of + tor achieves nothing useful. Addresses warning from bug 7164. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index b4d22c1..4acec6a 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -561,7 +561,7 @@ microdesc_free(microdesc_t *md) } }); if (found) { - log_warn(LD_BUG, "microdesc_free() called, but md was still referenced " + log_info(LD_BUG, "microdesc_free() called, but md was still referenced " "%d node(s); held_by_nodes == %u", found, md->held_by_nodes); } else { log_warn(LD_BUG, "microdesc_free() called with held_by_nodes set to %u, "

1 0

[tor/master] Merge remote-tracking branch 'andrea/bug11476'
by nickm＠torproject.org 01 May '14

01 May '14

commit 630b4af26097e9813505b87532806b9b032a84f4 Merge: 9511522 91ff10f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 11:30:55 2014 -0400 Merge remote-tracking branch 'andrea/bug11476' src/or/buffers.c | 6 +++--- src/test/test_buffers.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/master] Make --disable-buf-freelists build and pass unit tests
by nickm＠torproject.org 01 May '14

01 May '14

commit 91ff10f6be984c6ca00a7240d32e79ab7db09c7c Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Apr 29 02:18:34 2014 -0700 Make --disable-buf-freelists build and pass unit tests --- src/or/buffers.c | 6 +++--- src/test/test_buffers.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index fb18608..e54751d 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -117,6 +117,9 @@ chunk_repack(chunk_t *chunk) chunk->data = &chunk->mem[0]; } +/** Keep track of total size of allocated chunks for consistency asserts */ +static size_t total_bytes_allocated_in_chunks = 0; + #if defined(ENABLE_BUF_FREELISTS) || defined(RUNNING_DOXYGEN) /** A freelist of chunks. */ typedef struct chunk_freelist_t { @@ -148,9 +151,6 @@ static chunk_freelist_t freelists[] = { * could help with? */ static uint64_t n_freelist_miss = 0; -/** DOCDOC */ -static size_t total_bytes_allocated_in_chunks = 0; - static void assert_freelist_ok(chunk_freelist_t *fl); /** Return the freelist to hold chunks of size <b>alloc</b>, or NULL if diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 6dd7715..c2cfd27 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -481,13 +481,22 @@ test_buffer_allocation_tracking(void *arg) fetch_from_buf(junk, 4096, buf1); /* drop a 1k chunk... */ tt_int_op(buf_allocation(buf1), ==, 3*4096); /* now 3 4k chunks */ +#ifdef ENABLE_BUF_FREELISTS tt_int_op(buf_get_total_allocation(), ==, 16384); /* that chunk went onto the freelist. */ +#else + tt_int_op(buf_get_total_allocation(), ==, 12288); /* that chunk was really + freed. */ +#endif write_to_buf(junk, 4000, buf2); tt_int_op(buf_allocation(buf2), ==, 4096); /* another 4k chunk. */ - tt_int_op(buf_get_total_allocation(), ==, 16384); /* that chunk came from - the freelist. */ + /* + * If we're using freelists, size stays at 16384 because we just pulled a + * chunk from the freelist. If we aren't, we bounce back up to 16384 by + * allocating a new chunk. + */ + tt_int_op(buf_get_total_allocation(), ==, 16384); write_to_buf(junk, 4000, buf2); tt_int_op(buf_allocation(buf2), ==, 8192); /* another 4k chunk. */ tt_int_op(buf_get_total_allocation(), ==, 5*4096); /* that chunk was new. */

1 0

[tor/master] Changes file for bug 11623 (fix was in 91ff10f6be9)
by nickm＠torproject.org 01 May '14

01 May '14

commit 01e2aae12a81a0f6023455de47ebc52206ce3263 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 11:33:17 2014 -0400 Changes file for bug 11623 (fix was in 91ff10f6be9) --- changes/bug11623 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug11623 b/changes/bug11623 new file mode 100644 index 0000000..58ff06d --- /dev/null +++ b/changes/bug11623 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Make Tor compile correctly with --disable-buf-freelists. + Fixes bug 11623; bugfix on 0.2.5.3-alpha.

1 0

[meek/master] fmt.
by dcf＠torproject.org 01 May '14

01 May '14

commit fe04acbb2247a95e7f18cb541963abe38ccdf3a8 Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 1 08:20:30 2014 -0700 fmt. --- latencytest/latencytest.go | 2 +- meek-client-torbrowser/linux.go | 2 +- meek-client-torbrowser/mac.go | 2 +- meek-client-torbrowser/windows.go | 4 ++-- meek-client/meek-client.go | 16 ++++++++-------- meek-server/meek-server.go | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/latencytest/latencytest.go b/latencytest/latencytest.go index 4c248a2..e4ef0bf 100644 --- a/latencytest/latencytest.go +++ b/latencytest/latencytest.go @@ -24,7 +24,7 @@ var urls = [...]string{ const ( urlFetchTimeout = 10 * time.Second - numTrials = 5 + numTrials = 5 ) var context appengine.Context diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go index 6e8d847..35fb748 100644 --- a/meek-client-torbrowser/linux.go +++ b/meek-client-torbrowser/linux.go @@ -6,6 +6,6 @@ package main const ( - firefoxPath = "Browser/firefox" + firefoxPath = "Browser/firefox" firefoxProfilePath = "Data/Browser/profile.meek-http-helper" ) diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go index 6a11695..dbc8c8f 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -6,6 +6,6 @@ package main const ( - firefoxPath = "../Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox" + firefoxPath = "../Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox" firefoxProfilePath = "../Data/Browser/profile.meek-http-helper" ) diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go index 3ac9113..8a3c90f 100644 --- a/meek-client-torbrowser/windows.go +++ b/meek-client-torbrowser/windows.go @@ -6,6 +6,6 @@ package main const ( - firefoxPath string = "Browser/firefox.exe" - firefoxProfilePath = "Data/Browser/profile.meek-http-helper" + firefoxPath string = "Browser/firefox.exe" + firefoxProfilePath = "Data/Browser/profile.meek-http-helper" ) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 10aa597..8f0f319 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -21,15 +21,15 @@ import ( import "git.torproject.org/pluggable-transports/goptlib.git" const ( - ptMethodName = "meek" - sessionIdLength = 32 - maxPayloadLength = 0x10000 - initPollInterval = 100 * time.Millisecond - maxPollInterval = 5 * time.Second - pollIntervalMultiplier = 1.5 + ptMethodName = "meek" + sessionIdLength = 32 + maxPayloadLength = 0x10000 + initPollInterval = 100 * time.Millisecond + maxPollInterval = 5 * time.Second + pollIntervalMultiplier = 1.5 maxHelperResponseLength = 10000000 - helperReadTimeout = 60 * time.Second - helperWriteTimeout = 2 * time.Second + helperReadTimeout = 60 * time.Second + helperWriteTimeout = 2 * time.Second ) var ptInfo pt.ClientInfo diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 3ea445f..b77b765 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -20,14 +20,14 @@ import ( import "git.torproject.org/pluggable-transports/goptlib.git" const ( - ptMethodName = "meek" + ptMethodName = "meek" minSessionIdLength = 32 - maxPayloadLength = 0x10000 + maxPayloadLength = 0x10000 // How long we try to read something back from the ORPort before returning the // response. turnaroundTimeout = 10 * time.Millisecond // Passed as ReadTimeout and WriteTimeout when constructing the http.Server. - readWriteTimeout = 10 * time.Second + readWriteTimeout = 10 * time.Second maxSessionStaleness = 120 * time.Second ) @@ -236,8 +236,8 @@ func startServer(ln net.Listener) (net.Listener, error) { state := NewState() go state.ExpireSessions() server := &http.Server{ - Handler: state, - ReadTimeout: readWriteTimeout, + Handler: state, + ReadTimeout: readWriteTimeout, WriteTimeout: readWriteTimeout, } go func() {

1 0

[meek/master] Emit a log line for SIGTERM.
by dcf＠torproject.org 01 May '14

01 May '14

commit 3911f53558946e9f2904ba622941d59b0b542c2c Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 1 08:17:13 2014 -0700 Emit a log line for SIGTERM. --- meek-client/meek-client.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index f293b67..10aa597 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -307,7 +307,9 @@ func main() { ln.Close() } + log.Printf("got signal %s", sig) if sig == syscall.SIGTERM { + log.Printf("done") return } @@ -321,5 +323,6 @@ func main() { } } + log.Printf("got second signal %s", sig) log.Printf("done") }

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 01 May '14

01 May '14

commit 8704f41178572185fbdc098603022bfaf6cbf732 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 1 11:45:34 2014 +0000 Update translations for mat-gui_completed --- fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr.po b/fr.po index 190f95e..de94716 100644 --- a/fr.po +++ b/fr.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-05-01 11:15+0000\n" +"PO-Revision-Date: 2014-05-01 11:32+0000\n" "Last-Translator: bassmax\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "Métadonnées de %s" #: mat-gui:176 msgid "Trash your meta, keep your data" -msgstr "Supprimez vos métadonnées, conservez vos données" +msgstr "Supprimez les métadonnées, conservez vos données" #: mat-gui:181 msgid "Website" @@ -104,7 +104,7 @@ msgstr "Ces fichiers ne peuvent être traités :" #: mat-gui:334 mat-gui:363 data/mat.ui:292 msgid "Filename" -msgstr "Nom" +msgstr "Nom de fichier" #: mat-gui:336 msgid "Reason" @@ -191,7 +191,7 @@ msgstr "Support" #: data/mat.ui:512 msgid "Method" -msgstr "Procédé" +msgstr "Méthode" #: data/mat.ui:525 msgid "Remaining"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 01 May '14

01 May '14

commit c4fd4323e78387d46b5b8062d0e48d31654062d4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 1 11:45:32 2014 +0000 Update translations for mat-gui --- fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr.po b/fr.po index 190f95e..de94716 100644 --- a/fr.po +++ b/fr.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-05-01 11:15+0000\n" +"PO-Revision-Date: 2014-05-01 11:32+0000\n" "Last-Translator: bassmax\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "Métadonnées de %s" #: mat-gui:176 msgid "Trash your meta, keep your data" -msgstr "Supprimez vos métadonnées, conservez vos données" +msgstr "Supprimez les métadonnées, conservez vos données" #: mat-gui:181 msgid "Website" @@ -104,7 +104,7 @@ msgstr "Ces fichiers ne peuvent être traités :" #: mat-gui:334 mat-gui:363 data/mat.ui:292 msgid "Filename" -msgstr "Nom" +msgstr "Nom de fichier" #: mat-gui:336 msgid "Reason" @@ -191,7 +191,7 @@ msgstr "Support" #: data/mat.ui:512 msgid "Method" -msgstr "Procédé" +msgstr "Méthode" #: data/mat.ui:525 msgid "Remaining"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 01 May '14

01 May '14

commit 6e39ea1e58ccb8a1a372b50b8fd1544c98d00fe1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 1 11:45:25 2014 +0000 Update translations for tails-persistence-setup_completed --- fr/fr.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index a8d2842..9cf3727 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# bassmax, 2014 # chioubaca <chioubaca(a)gmail.com>, 2014 # arpalord <arpalord(a)gmail.com>, 2013 # jytou <saiolar-c(a)yahoo.fr>, 2013 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-17 15:01+0000\n" -"Last-Translator: chioubaca <chioubaca(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-01 11:31+0000\n" +"Last-Translator: bassmax\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgstr "Données personnelles" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" -msgstr "Conserver les fichiers contenus dans le dossier `Persistent'" +msgstr "Conserver les fichiers dans le dossier `Persistant'" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "GnuPG" @@ -73,11 +74,11 @@ msgstr "Secrets stockés dans le trousseau de GNOME." #: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" -msgstr "Connexions Réseaux" +msgstr "Connexions réseau" #: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" -msgstr "Configuration de cartes réseaux et connexions" +msgstr "Configuration des périphériques et des connexions réseau" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" @@ -105,7 +106,7 @@ msgstr "Paquets téléchargés par APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Lists" -msgstr "Listes d'APT" +msgstr "Listes APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Lists downloaded by APT" @@ -118,7 +119,7 @@ msgstr "Dotfiles" #: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" -msgstr "Créer un lien symbolique, dans $HOME, vers chaque fichier se trouvant dans le dossier `dotfiles'" +msgstr "Créer un lien symbolique, dans $HOME, vers chaque fichier ou dossier se trouvant dans le dossier `dotfiles'" #: ../lib/Tails/Persistence/Setup.pm:227 msgid "Setup Tails persistent volume"

1 0