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

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

20 May '17

commit 9c85cd3d66cbcc5a481040617ae37795a795b509 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 20 07:15:40 2017 +0000 Update translations for tails-persistence-setup_completed --- zh_TW/zh_TW.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 90b2e12..a5ec4b4 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -3,8 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Agustín Wu <losangwuyts(a)gmail.com>, 2016 -# cges30901 <cges30901(a)gmail.com>, 2014 +# Agustín Wu <losangwuyts(a)gmail.com>, 2016-2017 +# Hsiu-Ming Chang <cges30901(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 # 大圈洋蔥, 2016 # Wen-Gan Li <wgli(a)wgli.net>, 2015 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2016-12-21 05:31+0000\n" +"POT-Creation-Date: 2017-05-15 13:51+0200\n" +"PO-Revision-Date: 2017-05-20 06:46+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -57,12 +57,12 @@ msgid "Pidgin profiles and OTR keyring" msgstr "Pidgin 設定檔和 OTR 鑰匙圈" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 -msgid "Icedove" -msgstr "Icedove" +msgid "Thunderbird" +msgstr "Thunderbird" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 -msgid "Icedove profiles and locally stored email" -msgstr "Icedove 設定和本機所儲存的郵件" +msgid "Thunderbird profiles and locally stored email" +msgstr "Thunderbird 之相關屬性以及儲存在本地端的電子郵件" #: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 20 May '17

20 May '17

commit 9986ffa422db1f684fdc7133675a4f1f720a453d Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 20 07:15:35 2017 +0000 Update translations for tails-persistence-setup --- zh_TW/zh_TW.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 75628fb..a5ec4b4 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Agustín Wu <losangwuyts(a)gmail.com>, 2016 +# Agustín Wu <losangwuyts(a)gmail.com>, 2016-2017 # Hsiu-Ming Chang <cges30901(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 # 大圈洋蔥, 2016 @@ -15,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: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-05-17 03:09+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-05-20 06:46+0000\n" +"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,11 +58,11 @@ msgstr "Pidgin 設定檔和 OTR 鑰匙圈" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Thunderbird" -msgstr "" +msgstr "Thunderbird" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Thunderbird profiles and locally stored email" -msgstr "" +msgstr "Thunderbird 之相關屬性以及儲存在本地端的電子郵件" #: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring"

1 0

[tor/master] fix typo in comment
by arma＠torproject.org 20 May '17

20 May '17

commit a18b41cc776196c41cf79bdab25592a7ce8bbcc5 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 19 22:14:56 2017 -0400 fix typo in comment --- src/or/entrynodes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 7a27cd0..51fda60 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -67,7 +67,7 @@ * * While we're building circuits, we track a little "guard state" for * each circuit. We use this to keep track of whether the circuit is - * one that we can use as soon as its done, or whether it's one that + * one that we can use as soon as it's done, or whether it's one that * we should keep around to see if we can do better. In the latter case, * a periodic call to entry_guards_upgrade_waiting_circuits() will * eventually upgrade it.

1 0

[tor/master] elevate the "agree on canonical" stuff to major
by arma＠torproject.org 20 May '17

20 May '17

commit ceb012cea3813c58f69c58f820d33eb657d21148 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 19 20:58:54 2017 -0400 elevate the "agree on canonical" stuff to major --- ChangeLog | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58c46f8..08016bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,21 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? is set in torrc. These 24 hour totals are also rounded to multiples of 10000. + o Major bugfixes (connection usage): + - We use NETINFO cells to try to determine if both relays involved + in a connection will agree on the canonical status of that + connection. We prefer the connections where this is the case for + extend cells, and try to close connections where relays disagree + on their canonical status early. Also, we now prefer the oldest + valid connection for extend cells. These two changes should reduce + the number of long-term connections that are kept open between + relays. Fixes bug 17604; bugfix on 0.2.5.5-alpha. + - Relays now log hourly statistics (look for + "channel_check_for_duplicates" lines) on the total number of + connections to other relays. If the number of connections per + relay is unexpectedly large, this log message is at notice level. + Otherwise it is at info. + o Major bugfixes (linux TPROXY support): - Fix a typo that had prevented TPROXY-based transparent proxying from working under Linux. Fixes bug 18100; bugfix on 0.2.6.3-alpha. @@ -200,21 +215,6 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? making lots of circuits. With this change, a circuit build timeout is learned in about 15-20 minutes, instead of 100-120 minutes. - o Minor bugfixes (connection usage): - - Relays now log hourly statistics (look for - "channel_check_for_duplicates" lines) on the total number of - connections to other relays. If the number of connections per - relay is unexpectedly large, this log message is at notice level. - Otherwise it is at info. - - We use NETINFO cells to try to determine if both relays involved - in a connection will agree on the canonical status of that - connection. We prefer the connections where this is the case for - extend cells, and try to close connections where relays disagree - on their canonical status early. Also, we now prefer the oldest - valid connection for extend cells. These two changes should reduce - the number of long-term connections that are kept open between - relays. Fixes bug 17604; bugfix on 0.2.5.5-alpha. - o Minor bugfixes (controller): - GETINFO onions/current and onions/detached no longer respond with 551 on empty lists. Fixes bug 21329; bugfix on 0.2.7.1-alpha.

1 0

[tor/master] do a pass over the 0.3.1.1-alpha changelog
by arma＠torproject.org 20 May '17

20 May '17

commit fd860a77ea5831773671344af982a0216bf1e00a Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 19 20:49:44 2017 -0400 do a pass over the 0.3.1.1-alpha changelog --- ChangeLog | 99 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf16cd1..58c46f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,15 +17,17 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? now request these documents when available. When both client and server use this new protocol, they will use far less bandwidth (up to 94% less) to keep the client's consensus up-to-date. Implements - proposal 140; closes ticket 13339. Based on work by by - Daniel Martí. + proposal 140; closes ticket 13339. Based on work by Daniel Martí. - Tor can now compress directory traffic with lzma or with zstd - compression algoritms, which can deliver better bandwidth + compression algorithms, which can deliver better bandwidth performance. Because lzma is computationally expensive, it's only used for documents that can be compressed once and served many - times. Support for these algorithms requires that tor is build + times. Support for these algorithms requires that tor is built with the libzstd and/or liblzma libraries available. Implements proposal 278; closes ticket 21662. + - Relays now perform the more expensive compression operations, and + consensus diff generation, in worker threads. This separation + avoids delaying the main thread when a new consensus arrives. o Major features (experimental): - Tor can now build modules written in Rust. To turn this on, pass @@ -33,12 +35,13 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? get excited yet: currently, there is no actual Rust functionality beyond some simple glue code, and a notice at startup to tell you that Rust is running. Still, we hope that programmers and - packagers will try building Tor with rust support, so that we can - find issues, and solve portability problems. Closes ticket 22106. + packagers will try building Tor with Rust support, so that we can + find issues and solve portability problems. Closes ticket 22106. o Major features (traffic analysis resistance): - - Client-to-relays connections can now send a padding cells every - 1.5 to 9.5 seconds (tunable via consensus parameters). This will + - Connections between clients and relays now send a padding cell in + each direction every 1.5 to 9.5 seconds (tunable via consensus + parameters). This padding will not resist specialized eavesdroppers, but it should be enough to make many ISPs' routine network flow logging less useful in traffic analysis against Tor users. @@ -92,26 +95,22 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? 2017. Resolves ticket 21564. o Minor features (hidden services, logging): - - Add more information to the message logged when a hidden service - descriptor has fewer introduction points than specified in - HiddenServiceNumIntroductionPoints. Follow up to tickets 21598 and - 21599, closes ticket 21622. - Log a message when a hidden service descriptor has fewer introduction points than specified in - HiddenServiceNumIntroductionPoints. Closes ticket 21598. + HiddenServiceNumIntroductionPoints. Closes tickets 21598. - Log a message when a hidden service reaches its introduction point circuit limit, and when that limit is reset. Follow up to ticket - 21594, closes ticket 21622. + 21594; closes ticket 21622. - Warn user if multiple entries in EntryNodes and at least one - HiddenService are used together. Pinning EntryNodes along with an - hidden service can be possibly harmful for instance see ticket + HiddenService are used together. Pinning EntryNodes along with a + hidden service can be possibly harmful; for instance see ticket 14917 or 21155. Closes ticket 21155. - o Minor features (include in torrc config files): + o Minor features (config options): - Allow "%include" directives in torrc configuration files. These directives import the settings from other files, or from all the files in a directory. Closes ticket 1922. Code by Daniel Pinto. - - Make SAVECONF return error when overwriting a torrc that has + - Make SAVECONF return an error when overwriting a torrc that has includes. Using SAVECONF with the FORCE option will allow it to overwrite torrc even if includes are used. Related to ticket 1922. - Add "GETINFO config-can-saveconf" to tell controllers if SAVECONF @@ -136,7 +135,8 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? from toralf. o Minor features (performance): - - Our Keccak implementation now accesses memory more efficiently, + - Our Keccak (SHA-3) implementation now accesses memory more + efficiently, especially on little-endian systems. Closes ticket 21737. - Add an O(1) implementation of channel_find_by_global_id(), to speed some controller functions. @@ -147,7 +147,7 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? 4998; patch by Daniel Pinto. o Minor features (safety): - - Add an explict check to extrainfo_parse_entry_from_string() for + - Add an explicit check to extrainfo_parse_entry_from_string() for NULL inputs. We don't believe this can actually happen, but it may help silence a warning from the Clang analyzer. Closes ticket 21496. @@ -190,20 +190,21 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? unify CircuitIdleTimeout and PredictedPortsRelevanceTime into a single option called CircuitsAvailableTimeout. Also, allow the consensus to control the default values for both this preference - and lifespan of relay-to-relay connections. Fixes bug 17592; + and the lifespan of relay-to-relay connections. Fixes bug 17592; bugfix on 0.2.5.5-alpha. - - Increase the intial circuit build timeout testing frequency, to + - Increase the initial circuit build timeout testing frequency, to help ensure that ReducedConnectionPadding clients finish learning a timeout before their orconn would expire. The initial testing rate was set back in the days of TAP and before the Tor Browser updater, when we had to be much more careful about new clients - making lots of circuits. With this change, a circuit build time is - learned in about 15-20 minutes, instead of ~100-120 minutes. + making lots of circuits. With this change, a circuit build timeout is + learned in about 15-20 minutes, instead of 100-120 minutes. o Minor bugfixes (connection usage): - - Relays now log hourly statistics on the total number of + - Relays now log hourly statistics (look for + "channel_check_for_duplicates" lines) on the total number of connections to other relays. If the number of connections per - relay unexpectedly large, this log message is at notice level. + relay is unexpectedly large, this log message is at notice level. Otherwise it is at info. - We use NETINFO cells to try to determine if both relays involved in a connection will agree on the canonical status of that @@ -215,12 +216,12 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? relays. Fixes bug 17604; bugfix on 0.2.5.5-alpha. o Minor bugfixes (controller): - - GETINFO onions/current and onions/detached no longer 551 on empty - lists. Fixes bug 21329; bugfix on 0.2.7.1-alpha. + - GETINFO onions/current and onions/detached no longer respond with + 551 on empty lists. Fixes bug 21329; bugfix on 0.2.7.1-alpha. - Trigger HS descriptor events on the control port when the client fails to pick a hidden service directory for a hidden service. - This can happen if they all hidden service directories are in - ExcludeNodes, or they have all been queried inside the last 15 + This can happen if all the hidden service directories are in + ExcludeNodes, or they have all been queried within the last 15 minutes. Fixes bug 22042; bugfix on 0.2.5.2-alpha. o Minor bugfixes (directory authority): @@ -250,9 +251,9 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? selected. Fixes bug 20913; bugfix on 0.2.8.1-alpha. o Minor bugfixes (hidden services): - - Stop printing a cryptic warning when a client tries to connect to - invalid port on a hidden service. Fixes bug 16706; bugfix - on 0.2.6.3-alpha. + - Stop printing a cryptic warning when a hidden service gets a request + to connect to a virtual port that it hasn't configured. Fixes bug + 16706; bugfix on 0.2.6.3-alpha. - Simplify hidden service descriptor creation by using an existing flag to check if an introduction point is established. Fixes bug 21599; bugfix on 0.2.7.2-alpha. @@ -268,15 +269,15 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? 21293; bugfix on 0.1.1.14-alpha. o Minor bugfixes (testing): - - Make test-network.sh always call chutney's test-network.sh. - Previously, this only worked on systems which had bash installed, - due to some bash-specific code in the script. Fixes bug 19699; - bugfix on 0.3.0.4-rc. Follow-up to ticket 21581. - Use unbuffered I/O for utility functions around the process_handle_t type. This fixes unit test failures reported on OpenBSD and FreeBSD. Fixes bug 21654; bugfix on 0.2.3.1-alpha. - Make display of captured unit test log messages consistent. Fixes bug 21510; bugfix on 0.2.9.3-alpha. + - Make test-network.sh always call chutney's test-network.sh. + Previously, this only worked on systems which had bash installed, + due to some bash-specific code in the script. Fixes bug 19699; + bugfix on 0.3.0.4-rc. Follow-up to ticket 21581. o Minor bugfixes (voting consistency): - Reject version numbers with non-numeric prefixes (such as +, -, or @@ -295,9 +296,9 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? - Isolate our use of the openssl headers so that they are only included from our crypto wrapper modules, and from tests that examine those modules' internals. Closes ticket 21841. - - Our API to launch directory requests has been simplified to be - more extensible and less error-prone. We'll use this to support - adding extra headers to directory requests. Closes ticket 21646. + - Simplify our API to launch directory requests, making it + more extensible and less error-prone. Now it's easier to add + extra headers to directory requests. Closes ticket 21646. - Our base64 decoding functions no longer overestimate the output space that they need when parsing unpadded inputs. Closes ticket 17868. @@ -327,20 +328,18 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? o Removed features (configuration options, all in ticket 22060): - These configuration options are now marked Obsolete, and no longer - have any affect: AllowInvalidNodes, AllowSingleHopCircuits, + have any effect: AllowInvalidNodes, AllowSingleHopCircuits, AllowSingleHopExits, ExcludeSingleHopRelays, FastFirstHopPK, TLSECGroup, WarnUnsafeSocks. They were first marked as deprecated - in 0.2.9.2-alpha and have now has been removed. The previous - default behavior is now always-on; the previous (less secure) non- + in 0.2.9.2-alpha and have now been removed. The previous + default behavior is now always chosen; the previous (less secure) non- default behavior is now unavailable. - - CloseHSClientCircuitsImmediatelyOnTimeout was deprecated in - 0.2.9.2-alpha and now has been removed. HS circuits never close on - circuit build timeout, they have a longer timeout period. - - CloseHSServiceRendCircuitsImmediatelyOnTimeout was deprecated in - 0.2.9.2-alpha and now has been removed. HS circuits never close on - circuit build timeout, they have a long timeout period. + - CloseHSClientCircuitsImmediatelyOnTimeout and + CloseHSServiceRendCircuitsImmediatelyOnTimeout were deprecated in + 0.2.9.2-alpha and now have been removed. HS circuits never close + on circuit build timeout; they have a longer timeout period. - {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress were deprecated - in 0.2.9.2-alpha and now has been removed. Use the ORPort option + in 0.2.9.2-alpha and now have been removed. Use the ORPort option (and others) to configure listen-only and advertise-only addresses. o Removed features (tools):

1 0

[torspec/master] Merge remote-tracking branch 'asn/guard_spec_roger'
by nickm＠torproject.org 19 May '17

19 May '17

commit 6523ac863123a1cee8e17b7878a80edce5fca28c Merge: c815aad dc7bddf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 19 16:11:48 2017 -0400 Merge remote-tracking branch 'asn/guard_spec_roger' guard-spec.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[torspec/master] Fix some issues in guard-spec.txt pointed out by arma.
by nickm＠torproject.org 19 May '17

19 May '17

commit dc7bddf4aea0c6fd56bde4e3e0c7f67228f64626 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri May 19 15:16:20 2017 +0300 Fix some issues in guard-spec.txt pointed out by arma. See https://lists.torproject.org/pipermail/tor-dev/2017-May/012263.html . --- guard-spec.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/guard-spec.txt b/guard-spec.txt index 404df9a..69fff0a 100644 --- a/guard-spec.txt +++ b/guard-spec.txt @@ -326,7 +326,7 @@ Randomized to a point in the past as RAND(now, {GUARD_LIFETIME}/10). - We add new members to {CONFIRMED_GUARDS} when we mark a circuit + We append new members to {CONFIRMED_GUARDS} when we mark a circuit built through a guard as "for user traffic." Whenever we remove a member from {SAMPLED_GUARDS}, we also remove @@ -373,13 +373,13 @@ To compute primary guards, take the ordered intersection of {CONFIRMED_GUARDS} and {FILTERED_GUARDS}, and take the first {N_PRIMARY_GUARDS} elements. If there are fewer than - {N_PRIMARY_GUARDS} elements, add additional elements to + {N_PRIMARY_GUARDS} elements, append additional elements to PRIMARY_GUARDS chosen _uniformly_ at random from ({FILTERED_GUARDS} - {CONFIRMED_GUARDS}). Once an element has been added to {PRIMARY_GUARDS}, we do not remove it until it is replaced by some element from {CONFIRMED_GUARDS}. Confirmed - elements always proceed unconfirmed ones in the {PRIMARY_GUARDS} list. + elements always precede unconfirmed ones in the {PRIMARY_GUARDS} list. Note that {PRIMARY_GUARDS} do not have to be in {USABLE_FILTERED_GUARDS}: they might be unreachable. @@ -478,7 +478,7 @@ * Otherwise, if USABLE_FILTERED_GUARDS is empty, we have exhausted all the sampled guards. In this case we proceed by marking all guards - as <maybe> reachable so that we can keep on sampling. + as <maybe> reachable so that we can keep on trying circuits. Whenever we select a guard for a new circuit attempt, we update the {last_tried_connect} time for the guard to 'now.' @@ -784,8 +784,8 @@ A.4. Persistent state format "rsa_id" -- the RSA id digest for this guard, encoded in hex. Required. - "bridge_addr" -- If the guard is a bridge, its configured - address and OR port. Optional. + "bridge_addr" -- If the guard is a bridge, its configured address and + port (this can be the ORPort or a pluggable transport port). Optional. "nickname" -- the guard's nickname, if any. Optional.

1 0

[tor/master] Whoops; I broke check-spaces.
by nickm＠torproject.org 19 May '17

19 May '17

commit 09b3cb0d72d64547380ec98ebfa4823d2b01334a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 19 16:02:58 2017 -0400 Whoops; I broke check-spaces. --- src/test/test_config.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index eaf7e0d..40d562a 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5174,7 +5174,6 @@ test_config_include_path_syntax(void *data) tt_int_op(mkdir(dir, 0700), OP_EQ, 0); #endif - esc_dir = esc_for_log(dir); tor_asprintf(&dir_with_pathsep, "%s%s", dir, PATH_SEPARATOR); esc_dir_with_pathsep = esc_for_log(dir_with_pathsep);

1 0

[tor/master] Try another approach to fixing the bug in the #1922 test.
by nickm＠torproject.org 19 May '17

19 May '17

commit 13034e1574bf5ee8c7bacba2c1c19a4a8adc8de8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 19 15:50:27 2017 -0400 Try another approach to fixing the bug in the #1922 test. This isn't elegant, but it seems to be the best way around all of the issues involved in escaping and quoting that we've gotten into over the years. --- src/test/test_config.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 80579ea..eaf7e0d 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5164,6 +5164,8 @@ test_config_include_path_syntax(void *data) config_line_t *result = NULL; char *dir = tor_strdup(get_fname("test_include_path_syntax")); + char *esc_dir = NULL, *dir_with_pathsep = NULL, + *esc_dir_with_pathsep = NULL, *torrc_contents = NULL; tt_ptr_op(dir, OP_NE, NULL); #ifdef _WIN32 @@ -5172,18 +5174,18 @@ test_config_include_path_syntax(void *data) tt_int_op(mkdir(dir, 0700), OP_EQ, 0); #endif -#ifdef _WIN32 -#define ESCAPED_PATH_SEPARATOR "\\" PATH_SEPARATOR -#else -#define ESCAPED_PATH_SEPARATOR PATH_SEPARATOR -#endif - char torrc_contents[1000]; - tor_snprintf(torrc_contents, sizeof(torrc_contents), - "%%include \"%s\"\n" - "%%include %s"PATH_SEPARATOR"\n" - "%%include \"%s"ESCAPED_PATH_SEPARATOR"\"\n", - dir, dir, dir); + esc_dir = esc_for_log(dir); + tor_asprintf(&dir_with_pathsep, "%s%s", dir, PATH_SEPARATOR); + esc_dir_with_pathsep = esc_for_log(dir_with_pathsep); + + tor_asprintf(&torrc_contents, + "%%include %s\n" + "%%include %s%s \n" // space to avoid suppressing newline + "%%include %s\n", + esc_dir, + dir, PATH_SEPARATOR, + esc_dir_with_pathsep); int include_used; tt_int_op(config_get_lines_include(torrc_contents, &result, 0,&include_used), @@ -5194,6 +5196,10 @@ test_config_include_path_syntax(void *data) done: config_free_lines(result); tor_free(dir); + tor_free(torrc_contents); + tor_free(esc_dir); + tor_free(dir_with_pathsep); + tor_free(esc_dir_with_pathsep); } static void

1 0

[tor/master] mingw fix: avoid "unused var" warning.
by nickm＠torproject.org 19 May '17

19 May '17

commit 19615bce64cd381a925bc3910120ac39ca918e7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 19 15:50:12 2017 -0400 mingw fix: avoid "unused var" warning. --- src/test/test_switch_id.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index 44e02e8..53de793 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -79,6 +79,7 @@ main(int argc, char **argv) #if defined(_WIN32) (void) argc; (void) argv; + (void) which_test; fprintf(stderr, "This test is not supported on your OS.\n"); return 77;

1 0