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

[tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5
by nickm＠torproject.org 12 Feb '20

12 Feb '20

commit 88723ad1694a96bdbb713ccb5bb47a9f5acdc8bd Merge: 2b6df3da2 9d771ccc8 Author: teor <teor(a)torproject.org> Date: Wed Feb 12 12:18:59 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5 .travis.yml | 2 -- changes/ticket33075 | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.3] hs-v3: Remove BUG() that can occur normally
by nickm＠torproject.org 12 Feb '20

12 Feb '20

commit 88489cd29006f093e1a5572711b26ee1b057e359 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 4 10:13:10 2020 -0500 hs-v3: Remove BUG() that can occur normally Fixes #28992 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket28992 | 3 +++ src/feature/hs/hs_client.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/changes/ticket28992 b/changes/ticket28992 new file mode 100644 index 000000000..3e45d73e4 --- /dev/null +++ b/changes/ticket28992 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion service v3, client): + - Remove a BUG() that is causing a stacktrace for a situation that very + rarely happens but still can. Fixes bug 28992; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index fd2d26645..b045e1899 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -596,9 +596,14 @@ send_introduce1(origin_circuit_t *intro_circ, /* We need to find which intro point in the descriptor we are connected to * on intro_circ. */ ip = find_desc_intro_point_by_ident(intro_circ->hs_ident, desc); - if (BUG(ip == NULL)) { - /* If we can find a descriptor from this introduction circuit ident, we - * must have a valid intro point object. Permanent error. */ + if (ip == NULL) { + /* The following is possible if the descriptor was changed while we had + * this introduction circuit open and waiting for the rendezvous circuit to + * be ready. Which results in this situation where we can't find the + * corresponding intro point within the descriptor of the service. */ + log_info(LD_REND, "Unable to find introduction point for service %s " + "while trying to send an INTRODUCE1 cell.", + safe_str_client(onion_address)); goto perm_err; }

1 0

[tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1725' into maint-0.4.3
by nickm＠torproject.org 12 Feb '20

12 Feb '20

commit e0ea7407a4370c977ebbf0b70712c9e5ff7937fa Merge: 0e00d9369 88489cd29 Author: teor <teor(a)torproject.org> Date: Wed Feb 12 14:14:11 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1725' into maint-0.4.3 changes/ticket28992 | 3 +++ src/feature/hs/hs_client.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 12 Feb '20

12 Feb '20

commit 0e00d9369fa159bf0c44d0862e3d1f6b0c40ef50 Merge: de31c4757 ff5220536 Author: teor <teor(a)torproject.org> Date: Wed Feb 12 14:13:15 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 "ours" merge, because simiar BridgeDistribution fixes have already been merged to maint-0.4.3. (See 32753.) The stem changes in 33075 have already been merged to maint-0.4.3, so this "ours" merge does not affect them.

1 0

[tor/release-0.4.3] Addressed minor changes suggested in the ticket
by nickm＠torproject.org 12 Feb '20

12 Feb '20

commit 809090d24d8576258fab6077e5e54e33e5c78bbe Author: swati <swati.thacker(a)oracle.com> Date: Wed Feb 12 23:07:00 2020 +0530 Addressed minor changes suggested in the ticket --- doc/tor.1.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 84ff5841f..87b327b9c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2330,10 +2330,6 @@ is non-zero): level __notice__ message designed to help developers instrumenting Tor's main event loop. (Default: 0) -[[MaxOnionQueueDelay]] **MaxOnionQueueDelay** __NUM__ [**msec**|**second**]:: - If we have more onionskins queued for processing than we can process in - this amount of time, reject new ones. (Default: 1750 msec) - [[MaxMemInQueues]] **MaxMemInQueues** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: This option configures a threshold above which Tor will assume that it needs to stop queueing or buffering data because it's about to run out of @@ -2344,6 +2340,10 @@ is non-zero): this. If this option is set to 0, Tor will try to pick a reasonable default based on your system's physical memory. (Default: 0) +[[MaxOnionQueueDelay]] **MaxOnionQueueDelay** __NUM__ [**msec**|**second**]:: + If we have more onionskins queued for processing than we can process in + this amount of time, reject new ones. (Default: 1750 msec) + [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...:: Declare that this Tor relay is controlled or administered by a group or organization identical or similar to that of the other relays, defined by @@ -2527,11 +2527,6 @@ is non-zero): whatever the authorities suggest in the consensus (and block if the consensus is quiet on the issue). (Default: auto) -[[RephistTrackTime]] **RephistTrackTime** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: - Tells an authority, or other node tracking node reliability and history, - that fine-grained information about nodes can be discarded when it hasn't - changed for a given amount of time. (Default: 24 hours) - [[ServerDNSAllowBrokenConfig]] **ServerDNSAllowBrokenConfig** **0**|**1**:: If this option is false, Tor exits immediately if there are problems parsing the system DNS configuration or connecting to nameservers. @@ -2606,8 +2601,8 @@ is non-zero): // Please keep them that way! Relays publish most statistics in a document called the -extra-info document. The following options describe the different -types of statistics that Tor collects and writes: +extra-info document. The following options affect the different +types of statistics that Tor relays collect and publish: [[CellStatistics]] **CellStatistics** **0**|**1**:: Relays only. @@ -2681,6 +2676,11 @@ types of statistics that Tor collects and writes: If ExtraInfoStatistics is enabled, it will be published as a part of extra-info document. (Default: 1) +[[RephistTrackTime]] **RephistTrackTime** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: + Tells an authority, or other node tracking node reliability and history, + that fine-grained information about nodes can be discarded when it hasn't + changed for a given amount of time. (Default: 24 hours) + == DIRECTORY SERVER OPTIONS The following options are useful only for directory servers. (Relays with

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 12 Feb '20

12 Feb '20

commit ff52205362f5d60c209f298a3e3679bc65bdf539 Merge: 00fe21472 5298113da Author: teor <teor(a)torproject.org> Date: Wed Feb 12 12:22:04 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 2 -- changes/bug32753 | 3 +++ changes/ticket33075 | 4 ++++ src/app/config/config.c | 2 +- src/feature/relay/router.c | 15 ++++++++++----- src/test/test_config.c | 22 +++++++++++++++++++--- 6 files changed, 37 insertions(+), 11 deletions(-)

1 0

[tor/release-0.4.3] changes file for ticket 33188
by nickm＠torproject.org 12 Feb '20

12 Feb '20

commit 0ab859aabecf025dc9adb14d440605a477ce251f Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Feb 12 12:28:35 2020 -0600 changes file for ticket 33188 --- changes/ticket33188 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket33188 b/changes/ticket33188 new file mode 100644 index 000000000..7bec15b99 --- /dev/null +++ b/changes/ticket33188 @@ -0,0 +1,5 @@ + o Documentation (manpage): + - Alphabetize the Server and Directory server sections of the tor + manpage. Also split Statistics options into their own section + of the manpage. Closes ticket 33188. Work by Swati Thacker as + part of Google Season of Docs.

1 0

[tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3
by nickm＠torproject.org 12 Feb '20

12 Feb '20

commit 3147cbba52c3986c3f59101a7199dc73076d2b00 Merge: e0ea7407a 0ab859aab Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 12 13:48:39 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3 changes/ticket33188 | 5 + doc/tor.1.txt | 630 ++++++++++++++++++++++++++-------------------------- 2 files changed, 326 insertions(+), 309 deletions(-)

1 0

[tor/release-0.4.3] Moved [[RephistTrackTime]] to General Options.
by nickm＠torproject.org 12 Feb '20

12 Feb '20

commit d33c80f0ee3a6c88c911441673c39c1f266e2209 Author: swati <swati.thacker(a)oracle.com> Date: Wed Feb 12 23:17:31 2020 +0530 Moved [[RephistTrackTime]] to General Options. --- doc/tor.1.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 87b327b9c..db4dd2755 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -794,6 +794,11 @@ forward slash (/) in the configuration file and on the command line. fetches by the relay (from authority or other relays), because that is considered "client" activity. (Default: 0) +[[RephistTrackTime]] **RephistTrackTime** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: + Tells an authority, or other node tracking node reliability and history, + that fine-grained information about nodes can be discarded when it hasn't + changed for a given amount of time. (Default: 24 hours) + [[RunAsDaemon]] **RunAsDaemon** **0**|**1**:: If 1, Tor forks and daemonizes to the background. This option has no effect on Windows; instead you should use the --service command-line option. @@ -2676,11 +2681,6 @@ types of statistics that Tor relays collect and publish: If ExtraInfoStatistics is enabled, it will be published as a part of extra-info document. (Default: 1) -[[RephistTrackTime]] **RephistTrackTime** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: - Tells an authority, or other node tracking node reliability and history, - that fine-grained information about nodes can be discarded when it hasn't - changed for a given amount of time. (Default: 24 hours) - == DIRECTORY SERVER OPTIONS The following options are useful only for directory servers. (Relays with

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 12 Feb '20

12 Feb '20

commit 457a7056134e7bd7dca1f51770b3b141fd707a65 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 12 17:45:35 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/mk/LC_MESSAGES/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/mk/LC_MESSAGES/messages.po b/locale/mk/LC_MESSAGES/messages.po index ba2bfe7f74..87505faf6e 100644 --- a/locale/mk/LC_MESSAGES/messages.po +++ b/locale/mk/LC_MESSAGES/messages.po @@ -1215,7 +1215,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:178 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:95 msgid "Who uses Tor?" -msgstr "Кој користи Tor?." +msgstr "Кој користи Tor?" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:182 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:99 @@ -2392,7 +2392,7 @@ msgstr "Донирај сега" #: tmp/cache_locale/2c/2c32942b896dd845bd6204d3104922983a843d726e231446ff21ddb2a33f6cda.php:29 #: tmp/cache_locale/2c/2c32942b896dd845bd6204d3104922983a843d726e231446ff21ddb2a33f6cda.php:52 msgid "Donate to the Tor Project and protect the privacy of millions." -msgstr "Донирајте на Tor проектот и зашитете ја приватноста на милиони." +msgstr "Донирајте на Tor проектот и заштитете ја приватноста на милиони." #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:54 #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:77

1 0