April 2015 - tor-commits - lists.torproject.org

[tor-browser-bundle/maint-4.0] Update the update_responses config for 4.0.7.
by mikeperry＠torproject.org 07 Apr '15

07 Apr '15

commit d24e8e313966f03ffef11752a57a3158d8f947bf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 7 12:21:23 2015 -0700 Update the update_responses config for 4.0.7. --- tools/update-responses/config.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 682f5cc..7d5c391 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,16 +6,15 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.6 + release: 4.0.7 alpha: 4.5-alpha-2 versions: - 4.0.6: + 4.0.7: platformVersion: 31.6.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.6 + download_url: https://www.torproject.org/dist/torbrowser/4.0.7 incremental_from: - - 4.0.4 - - 4.0.5 + - 4.0.6 4.5-alpha-2: platformVersion: 31.3.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en

1 0

[tor/master] Merge branch 'bug15604_squashed'
by nickm＠torproject.org 07 Apr '15

07 Apr '15

commit 202bbfbaa4768ca34dbdff4931506823aa23f626 Merge: edde1a7 fda2aa7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 7 15:15:54 2015 -0400 Merge branch 'bug15604_squashed' changes/bug15604 | 7 +++++++ src/or/config.c | 1 + 2 files changed, 8 insertions(+)

1 0

[tor/master] Set ConnDirectionStatistics back to 0 if not running as relay.
by nickm＠torproject.org 07 Apr '15

07 Apr '15

commit fda2aa7703b05074a4d5d433ac5e8411e695d897 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Apr 6 20:09:34 2015 +0300 Set ConnDirectionStatistics back to 0 if not running as relay. --- changes/bug15604 | 7 +++++++ src/or/config.c | 1 + 2 files changed, 8 insertions(+) diff --git a/changes/bug15604 b/changes/bug15604 new file mode 100644 index 0000000..de29380 --- /dev/null +++ b/changes/bug15604 @@ -0,0 +1,7 @@ + o Minor bugfixes + - Disregard the ConnDirectionStatistics torrc options when Tor is + not a relay since in that mode of operation no sensible data is + being collected and because Tor might run into measurement hiccups + when running as a client for some time, then becoming a relay. Fixes + bug 15604; bugfix on 0.2.2.35. + diff --git a/src/or/config.c b/src/or/config.c index d65d35d..8319f7c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1736,6 +1736,7 @@ options_act(const or_options_t *old_options) if (!public_server_mode(options)) { options->CellStatistics = 0; options->EntryStatistics = 0; + options->ConnDirectionStatistics = 0; options->HiddenServiceStatistics = 0; options->ExitPortStatistics = 0; }

1 0

[tor/master] Fix error message in do_dump_config().
by nickm＠torproject.org 07 Apr '15

07 Apr '15

commit ad54c197a97ba71129a8d223c1dae665e19b9d8f Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Apr 6 21:01:43 2015 +0300 Fix error message in do_dump_config(). --- src/or/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index a816fad..c0ca158 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2803,6 +2803,7 @@ do_dump_config(void) const char *arg = options->command_arg; int how; char *opts; + if (!strcmp(arg, "short")) { how = OPTIONS_DUMP_MINIMAL; } else if (!strcmp(arg, "non-builtin")) { @@ -2810,8 +2811,9 @@ do_dump_config(void) } else if (!strcmp(arg, "full")) { how = OPTIONS_DUMP_ALL; } else { - fprintf(stderr, "%s is not a recognized argument to --dump-config. " - "Please select 'short', 'non-builtin', or 'full'", arg); + fprintf(stderr, "No recognizable option to --dump-config found!\n"); + fprintf(stderr, "Please select 'short', 'non-builtin', or 'full'.\n"); + return -1; }

1 0

[tor/master] Print the error message for --dump-config even if no arguments are given.
by nickm＠torproject.org 07 Apr '15

07 Apr '15

commit e89c200c47fdb6253ee99d3603e86a8f1bdbab8c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Apr 6 21:36:55 2015 +0300 Print the error message for --dump-config even if no arguments are given. --- changes/bug15541 | 5 +++++ src/or/config.c | 21 ++++++++++++++++----- src/or/main.c | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/changes/bug15541 b/changes/bug15541 new file mode 100644 index 0000000..f73ce5f --- /dev/null +++ b/changes/bug15541 @@ -0,0 +1,5 @@ + o Minor bugfixes (interface): + - Print usage information for --dump-config when it is used without + an argument. Also, fix the error message to use different wording + and add newline at the end. Fixes bug 15541; bugfix on 0.2.5.1-alpha. + diff --git a/src/or/config.c b/src/or/config.c index d65d35d..ddd20ee 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1868,15 +1868,21 @@ options_act(const or_options_t *old_options) return 0; } +typedef enum { + TAKES_NO_ARGUMENT = 0, + ARGUMENT_NECESSARY = 1, + ARGUMENT_OPTIONAL = 2 +} takes_argument_t; + static const struct { const char *name; - int takes_argument; + takes_argument_t takes_argument; } CMDLINE_ONLY_OPTIONS[] = { { "-f", 1 }, { "--allow-missing-torrc", 0 }, { "--defaults-torrc", 1 }, { "--hash-password", 1 }, - { "--dump-config", 1 }, + { "--dump-config", ARGUMENT_OPTIONAL }, { "--list-fingerprint", 0 }, { "--verify-config", 0 }, { "--ignore-missing-torrc", 0 }, @@ -1915,7 +1921,7 @@ config_parse_commandline(int argc, char **argv, int ignore_errors, while (i < argc) { unsigned command = CONFIG_LINE_NORMAL; - int want_arg = 1; + takes_argument_t want_arg = ARGUMENT_NECESSARY; int is_cmdline = 0; int j; @@ -1945,7 +1951,9 @@ config_parse_commandline(int argc, char **argv, int ignore_errors, want_arg = 0; } - if (want_arg && i == argc-1) { + const int is_last = (i == argc-1); + + if (want_arg == ARGUMENT_NECESSARY && is_last) { if (ignore_errors) { arg = strdup(""); } else { @@ -1955,8 +1963,11 @@ config_parse_commandline(int argc, char **argv, int ignore_errors, config_free_lines(front_cmdline); return -1; } + } else if (want_arg == ARGUMENT_OPTIONAL && is_last) { + arg = tor_strdup(""); } else { - arg = want_arg ? tor_strdup(argv[i+1]) : strdup(""); + arg = (want_arg != TAKES_NO_ARGUMENT) ? tor_strdup(argv[i+1]) : + tor_strdup(""); } param = tor_malloc_zero(sizeof(config_line_t)); diff --git a/src/or/main.c b/src/or/main.c index c0ca158..a3da148 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2811,7 +2811,7 @@ do_dump_config(void) } else if (!strcmp(arg, "full")) { how = OPTIONS_DUMP_ALL; } else { - fprintf(stderr, "No recognizable option to --dump-config found!\n"); + fprintf(stderr, "No valid argument to --dump-config found!\n"); fprintf(stderr, "Please select 'short', 'non-builtin', or 'full'.\n"); return -1;

1 0

[tor/master] Update other entries in CMDLINE_ONLY_OPTIONS to use values from takes_argument_t.
by nickm＠torproject.org 07 Apr '15

07 Apr '15

commit 6b0c443dde31f57f00c36ef4d53bd85bdfef8d79 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Apr 6 22:05:27 2015 +0300 Update other entries in CMDLINE_ONLY_OPTIONS to use values from takes_argument_t. --- src/or/config.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index ddd20ee..825bd18 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1878,23 +1878,23 @@ static const struct { const char *name; takes_argument_t takes_argument; } CMDLINE_ONLY_OPTIONS[] = { - { "-f", 1 }, - { "--allow-missing-torrc", 0 }, - { "--defaults-torrc", 1 }, - { "--hash-password", 1 }, + { "-f", ARGUMENT_NECESSARY }, + { "--allow-missing-torrc", TAKES_NO_ARGUMENT }, + { "--defaults-torrc", ARGUMENT_NECESSARY }, + { "--hash-password", ARGUMENT_NECESSARY }, { "--dump-config", ARGUMENT_OPTIONAL }, - { "--list-fingerprint", 0 }, - { "--verify-config", 0 }, - { "--ignore-missing-torrc", 0 }, - { "--quiet", 0 }, - { "--hush", 0 }, - { "--version", 0 }, - { "--library-versions", 0 }, - { "-h", 0 }, - { "--help", 0 }, - { "--list-torrc-options", 0 }, - { "--nt-service", 0 }, - { "-nt-service", 0 }, + { "--list-fingerprint", TAKES_NO_ARGUMENT }, + { "--verify-config", TAKES_NO_ARGUMENT }, + { "--ignore-missing-torrc", TAKES_NO_ARGUMENT }, + { "--quiet", TAKES_NO_ARGUMENT }, + { "--hush", TAKES_NO_ARGUMENT }, + { "--version", TAKES_NO_ARGUMENT }, + { "--library-versions", TAKES_NO_ARGUMENT }, + { "-h", TAKES_NO_ARGUMENT }, + { "--help", TAKES_NO_ARGUMENT }, + { "--list-torrc-options", TAKES_NO_ARGUMENT }, + { "--nt-service", TAKES_NO_ARGUMENT }, + { "-nt-service", TAKES_NO_ARGUMENT }, { NULL, 0 }, };

1 0

[tor/master] Merge branch 'bug15541_squashed'
by nickm＠torproject.org 07 Apr '15

07 Apr '15

commit edde1a7844f6c0e3aafd8463edc3c10f486eb51c Merge: 1457364 6b0c443 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 7 14:09:55 2015 -0400 Merge branch 'bug15541_squashed' changes/bug15541 | 5 +++++ src/or/config.c | 53 ++++++++++++++++++++++++++++++++--------------------- src/or/main.c | 6 ++++-- 3 files changed, 41 insertions(+), 23 deletions(-)

1 0

[tor/master] Merge branch 'doc15550_squashed'
by nickm＠torproject.org 07 Apr '15

07 Apr '15

commit 1457364c497d5a455d41d95118caad342d63bb8f Merge: f0fa0d2 6364952 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 7 14:05:52 2015 -0400 Merge branch 'doc15550_squashed' changes/doc15550 | 4 ++++ doc/tor.1.txt | 42 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 8 deletions(-)

1 0

[tor/master] Improve descriptions of statistics-related torrc options.
by nickm＠torproject.org 07 Apr '15

07 Apr '15

commit 636495257b69c50e8179a03378f28146306f557a Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Apr 6 19:18:35 2015 +0300 Improve descriptions of statistics-related torrc options. --- changes/doc15550 | 4 ++++ doc/tor.1.txt | 42 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/changes/doc15550 b/changes/doc15550 new file mode 100644 index 0000000..f953bbf --- /dev/null +++ b/changes/doc15550 @@ -0,0 +1,4 @@ + o Documentation: + - Improve the descriptions of statistics-related torrc options in + the manpage to describe rationale and possible uses cases. Fixes + issue 15550. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ed7cff9..2bb5f94 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1784,27 +1784,53 @@ is non-zero): (Default: P256) [[CellStatistics]] **CellStatistics** **0**|**1**:: - When this option is enabled, Tor writes statistics on the mean time that - cells spend in circuit queues to disk every 24 hours. (Default: 0) + Relays only. + When this option is enabled, Tor collects statistics about cell + processing (i.e. mean time a cell is spending in a queue, mean + number of cells in a queue and mean number of processed cells per + circuit) and writes them into disk every 24 hours. Onion router + operators may use the statistics for performance monitoring. + If ExtraInfoStatistics is enabled, it will published as part of + extra-info document. (Default: 0) [[DirReqStatistics]] **DirReqStatistics** **0**|**1**:: + Relays and bridges only. When this option is enabled, a Tor directory writes statistics on the number and response time of network status requests to disk every 24 - hours. (Default: 1) + hours. Enables relay and bridge operators to monitor how much their + server is being used by clients to learn about Tor network. + If ExtraInfoStatistics is enabled, it will published as part of + extra-info document. (Default: 1) [[EntryStatistics]] **EntryStatistics** **0**|**1**:: + Relays only. When this option is enabled, Tor writes statistics on the number of - directly connecting clients to disk every 24 hours. (Default: 0) + directly connecting clients to disk every 24 hours. Enables relay + operators to monitor how much inbound traffic that originates from + Tor clients passes through their server to go further down the + Tor network. If ExtraInfoStatistics is enabled, it will be published + as part of extra-info document. (Default: 0) [[ExitPortStatistics]] **ExitPortStatistics** **0**|**1**:: - When this option is enabled, Tor writes statistics on the number of relayed - bytes and opened stream per exit port to disk every 24 hours. (Default: 0) + Exit relays only. + When this option is enabled, Tor writes statistics on the number of + relayed bytes and opened stream per exit port to disk every 24 hours. + Enables exit relay operators to measure and monitor amounts of traffic + that leaves Tor network through their exit node. If ExtraInfoStatistics + is enabled, it will be published as part of extra-info document. + (Default: 0) [[ConnDirectionStatistics]] **ConnDirectionStatistics** **0**|**1**:: - When this option is enabled, Tor writes statistics on the bidirectional use - of connections to disk every 24 hours. (Default: 0) + Relays only. + When this option is enabled, Tor writes statistics on the amounts of + traffic it passes between itself and other relays to disk every 24 + hours. Enables relay operators to monitor how much their relay is + being used as middle node in the circuit. If ExtraInfoStatistics is + enabled, it will be published as part of extra-info document. + (Default: 0) [[HiddenServiceStatistics]] **HiddenServiceStatistics** **0**|**1**:: + Relays only. When this option is enabled, a Tor relay writes obfuscated statistics on its role as hidden-service directory, introduction point, or rendezvous point to disk every 24 hours. If

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 07 Apr '15

07 Apr '15

commit 437f0d5d1cbf5dbd0e06c7492d7f5bddd4a3223f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 7 16:16:13 2015 +0000 Update translations for torbutton-torbuttonproperties --- cs/torbutton.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cs/torbutton.properties b/cs/torbutton.properties index 2331e70..52660b5 100644 --- a/cs/torbutton.properties +++ b/cs/torbutton.properties @@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Povolit Tor torbutton.button.tooltip.enabled = Zakázat Tor torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = Neznámá IP adresa -torbutton.circuit_display.onion_site = Onion site +torbutton.circuit_display.onion_site = Onion stránka torbutton.circuit_display.this_browser = Tento prohlížeč -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = přenos torbutton.circuit_display.tor_bridge = Most torbutton.circuit_display.unknown_country = Neznámá země torbutton.panel.tooltip.disabled = Klikni pro povolení Tor @@ -53,12 +53,12 @@ torbutton.popup.short_torbrowser = Důležitá Torbutton informace!\n\nTorbutton torbutton.popup.confirm_plugins = Pluginy jako Flash mohou narušit vaše soukromí a vaši anonymitu.\n\nTaké mohou obejít Tor a způsobit odhalení vašeho umístění a IP adresu.\n\nJste si jistý že chcete povolit pluginy?\n\n torbutton.popup.never_ask_again = Znovu se mě neptat -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Tor Browser zavře všechna okna a panely. Všechny relace budou ztraceny.\nRestartovat Tor Browser pro resetování Vaší identity?\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Menu zelené cibule má nyní bezpečnostní nabídku, která umožňuje nastavit úroveň bezpečnosti. Zkuste ji! +torbutton.slider_notification_button = Otevřít nastavení bezpečnosti. -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Maximalizování Tor Browseru může dovolit webovým stránkám, aby zjistily velikost Vašeho monitoru, což může být použito k sledování. Doporučujeme ponechat Tor Browser v přednastavené velikosti okna. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Tato stránka(%S) se pokusila extrahovat HTML5 canvas image data, která mohou být použita k unikátní identifikaci vašeho počítače.\n\nMá Tor Browser povolit této stránce extrahovat HTML5 canvas image data? @@ -71,7 +71,7 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileProblemTitle=%S Profilový problém +profileReadOnly=Není možné spustit %S ze souborového systému pouze pro čtení. Prosím, zkopírujte %S na jiné místo, než ho budete používat. +profileReadOnlyMac=Není možné spustit %S ze souborového systému pouze pro čtení. Prosím, zkopírujte %S na Plochu nebo do Složky s aplikacemi, než ho budete používat. +profileAccessDenied=%S nemá oprávnění k přístupu k profilu. Prosím přenastavte oprávnění Vašeho souborového systému a zkuste to znovu.

1 0