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

[tpo/master] Change agix description
by gus＠torproject.org 23 Nov '20

23 Nov '20

commit b1d8c9876d3a4a0ec7e4f3b7f0a61bcb71c24f77 Author: agix <columbeff(a)gmail.com> Date: Mon Nov 23 21:03:20 2020 +0100 Change agix description Small bio change. Thanks Gustavo. --- content/about/people/agix/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/agix/contents.lr b/content/about/people/agix/contents.lr index 945ee74b..2049222e 100644 --- a/content/about/people/agix/contents.lr +++ b/content/about/people/agix/contents.lr @@ -17,4 +17,4 @@ gpg: https://agix.at/pgp-key.html image: /static/images/people/agix.png --- description: -I work as a security researcher and contribute to Tor's anti-censorship team. +Security researcher and contributes to Tor's anti-censorship team.

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 23 Nov '20

23 Nov '20

commit d565840c0cbaa3070e77c1b7de7bf834dc519638 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 23 20:15:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+he.po | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/contents+he.po b/contents+he.po index 358463952e..3323192ef1 100644 --- a/contents+he.po +++ b/contents+he.po @@ -10979,7 +10979,7 @@ msgstr "הערה: ה FAQ הזה הנו אינפורמטיבי בלבד ואינ msgid "" "Our aim is to provide a general description of the legal issues surrounding " "Tor in the United States." -msgstr "" +msgstr "המטרה שלנו לספק תאור כללי של הנושאים המשפטיים סביב Tor בארה\"ב." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body) @@ -10988,6 +10988,9 @@ msgid "" "or https://community.torproject.org/relay/community-resources/eff-tor-legal-" "faq, it may be out of date. Follow the link to get the latest version." msgstr "" +"גם כן, אם קיבלתם מסמך זה מכל מקום שהוא שאינו אתר EFF או " +"https://community.torproject.org/relay/community-resources/eff-tor-legal-" +"faq, הוא עלול להיות לא מעודכן. עקבו אחר הקישור כדי לקבל את הגירסה האחרונה." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body) @@ -10995,16 +10998,18 @@ msgid "" "Got a DMCA notice? Check out our [sample response letter](/relay/community-" "resources/eff-tor-legal-faq/tor-dmca-response)!" msgstr "" +"קיבלתם הודעת DMCA ?בדקו את [sample response letter](/relay/community-" +"resources/eff-tor-legal-faq/tor-dmca-response)!" #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body) msgid "## General Information" -msgstr "" +msgstr "## מידע כללי" #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body) msgid "### Has anyone ever been sued or prosecuted for running Tor?" -msgstr "" +msgstr "### האם מישהו אי פעם נתבע או הועמד לדין על הפעלת Tor?" #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body) @@ -11014,6 +11019,9 @@ msgid "" "and other countries has occasionally mistakenly investigated individuals " "running a Tor relay." msgstr "" +"**למרות שאיננו מודעים לפרט כלשהו שנתבע, הואשם, או הורשע על הפעלת ניתוב Tor " +"**, רשויות החוק בארה\"ב ובמקומות אחרים לעתים בטעות חוקרים פרטים שמפעילים " +"ניתוב Tor." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 23 Nov '20

23 Nov '20

commit 4f072a2979752f6e2400b310bb442224ffdb981a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 23 19:45:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+he.po | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/contents+he.po b/contents+he.po index a28fc240f2..358463952e 100644 --- a/contents+he.po +++ b/contents+he.po @@ -10933,11 +10933,14 @@ msgid "" "itself -- doing research on the Tor network requires that there be a Tor " "network, after all, and keeping it going is a community effort." msgstr "" +"יש לשים לב שבמקרים רבים אין צורך לבצע מחקר על ניתוב היציאה עצמו -- ביצוע " +"בדיקה על רשת Tor כולה מחייב שתהיה רשת Tor, ככלות הכל, ושמירת המשך קיומה זהו" +" מאמץ קהילתי." #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body) msgid "## Mailing list" -msgstr "" +msgstr "## קבוצת מייל" #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body) @@ -10946,11 +10949,14 @@ msgid "" "bin/mailman/listinfo/tor-relays-universities) mailing list (and other " "education institutions too)." msgstr "" +"הרשמו לקבוצת המייל [Tor Relays Universities](https://lists.torproject.org" +"/cgi-bin/mailman/listinfo/tor-relays-universities) (and other education " +"institutions too)." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.title) msgid "The Legal FAQ for Tor Relay Operators" -msgstr "" +msgstr "שאלות ותשובות משפטיות למפעילי ניתוב Tor" #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.subtitle) @@ -10958,13 +10964,15 @@ msgid "" "FAQ written by the Electronic Frontier Foundation (EFF). Last updated March " "27, 2020." msgstr "" +"FAQ נכתב על ידי Electronic Frontier Foundation (EFF). עודכן לאחרונה 27 במרץ," +" 2020." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body) msgid "" "NOTE: This FAQ is for informational purposes only and does not constitute " "legal advice." -msgstr "" +msgstr "הערה: ה FAQ הזה הנו אינפורמטיבי בלבד ואינו מהווה יעוץ משפטי." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body)

1 0

[tor/master] Remove changes files for things that went out in 0.4.5.2-alpha or earlier
by nickm＠torproject.org 23 Nov '20

23 Nov '20

commit 94fc207d42a18d1e3c1358dac4fbd5150af6609f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 23 14:15:31 2020 -0500 Remove changes files for things that went out in 0.4.5.2-alpha or earlier --- changes/bug30187 | 5 ----- changes/bug32880 | 5 ----- changes/bug40015 | 4 ---- changes/bug40017 | 5 ----- changes/bug40172 | 3 --- changes/bug40177 | 3 --- changes/bug40179_part1 | 4 ---- changes/bug40179_part2 | 4 ---- changes/bug40187 | 5 ----- changes/ticket18888 | 3 --- changes/ticket22473 | 3 --- changes/ticket25528 | 6 ------ changes/ticket32178 | 3 --- changes/ticket40071 | 7 ------- changes/ticket40142 | 3 --- changes/ticket40165 | 5 ----- changes/ticket40170 | 3 --- changes/ticket40174 | 4 ---- changes/ticket40183 | 4 ---- changes/ticket40195 | 5 ----- 20 files changed, 84 deletions(-) diff --git a/changes/bug30187 b/changes/bug30187 deleted file mode 100644 index 2a3358d6be..0000000000 --- a/changes/bug30187 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (relay, windows): - - Fix bug where running a relay on Windows would use 100% - CPU after some time. Makes Windows >= Vista the required - Windows version to build and run tor. Fixes bug 30187; - bugfix on 0.4.5.1-alpha. Patch by Daniel Pinto. diff --git a/changes/bug32880 b/changes/bug32880 deleted file mode 100644 index a25cabb7dc..0000000000 --- a/changes/bug32880 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (circuit, handshake): - - In the v3 handshaking code, Use connection_or_change_state() to change - the state. Previously, we changed the state directly, but this did not - pass a state change to the pubsub or channel object. Fixes bug 32880; - bugfix on 0.2.3.6-alpha. Patch by Neel Chauhan. diff --git a/changes/bug40015 b/changes/bug40015 deleted file mode 100644 index 1d190df751..0000000000 --- a/changes/bug40015 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (crash, relay, signing key): - - Avoid asserts when we run Tor from the command line with - `--key-expiration sign` when an ORPort is not set. Fixes - bug 40015; bugfix on 0.3.2.1-alpha. Patch by Neel Chauhan. diff --git a/changes/bug40017 b/changes/bug40017 deleted file mode 100644 index 3f5c2da968..0000000000 --- a/changes/bug40017 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (protocol, proxy support, defense in depth): - - Respond more deliberately to misbehaving proxies that leave leftover - data on their connections, so as to be even less likely as to allow - them to pass their data off as having come from a relay. - Closes ticket 40017. diff --git a/changes/bug40172 b/changes/bug40172 deleted file mode 100644 index a73fcb39a3..0000000000 --- a/changes/bug40172 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compilation): - - Fix a compilation issue in which the correct 'ranlib' program was not - used when building libtor.a. Fixes bug 40172; bugfix on 0.4.5.1-alpha. diff --git a/changes/bug40177 b/changes/bug40177 deleted file mode 100644 index b08be64e47..0000000000 --- a/changes/bug40177 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compilation): - - Remove a duplicate typedef in metrics_store.c. Fixes bug 40177; - bugfix on 0.4.5.1-alpha. diff --git a/changes/bug40179_part1 b/changes/bug40179_part1 deleted file mode 100644 index c302373534..0000000000 --- a/changes/bug40179_part1 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (testing, portability): - - Fix our Python reference-implementation for the v3 onion service - handshake so that it works correctly with the version of hashlib provided - by Python 3.9. Fixes part of bug 40179; bugfix on 0.3.1.6-rc. diff --git a/changes/bug40179_part2 b/changes/bug40179_part2 deleted file mode 100644 index 15dc861321..0000000000 --- a/changes/bug40179_part2 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (testing): - - Fix the config/parse_tcp_proxy_line test so that it works correctly on - systems where the DNS provider hijacks invalid queries. - Fixes part of bug 40179; bugfix on 0.4.3.1-alpha. diff --git a/changes/bug40187 b/changes/bug40187 deleted file mode 100644 index 563e4b4d76..0000000000 --- a/changes/bug40187 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (testing): - - Fix unit tests that used newly generated list of routers so that they - check them with respect to the date when they were generated, not - with respect to the current time. Fixes bug 40187; bugfix on - 0.4.5.1-alpha. diff --git a/changes/ticket18888 b/changes/ticket18888 deleted file mode 100644 index 279eab76ad..0000000000 --- a/changes/ticket18888 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (safety): - - Log a warning at startup if Tor is built with compile-time options that - are likely to make it less stable or reliable. Closes ticket 18888. diff --git a/changes/ticket22473 b/changes/ticket22473 deleted file mode 100644 index c7496f9da7..0000000000 --- a/changes/ticket22473 +++ /dev/null @@ -1,3 +0,0 @@ - o Removed features (controller): - - Remove the "GETINFO network-status" controller command. It has - been deprecated since 0.3.1.1-alpha. Closes ticket 22473. diff --git a/changes/ticket25528 b/changes/ticket25528 deleted file mode 100644 index cfc6c91fb7..0000000000 --- a/changes/ticket25528 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (client, bridge, configuration): - - Exit tor on a misconfiguration when the Bridge line has a transport but - no corresponding ClientTransportPlugin can be found. Prior to this fix, - tor would attempt to connect to the bridge directly without using the - transport leading to a possible leak on the wire. Fixes bug 25528; - bugfix on 0.2.6.1-alpha. diff --git a/changes/ticket32178 b/changes/ticket32178 deleted file mode 100644 index c13e490cb0..0000000000 --- a/changes/ticket32178 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (logging): - - Remove trailing whitespaces from control event log messages. Fixes bug - 32178; bugfix on 0.1.1.1-alpha. Based on a patch by Amadeusz Pawlik. diff --git a/changes/ticket40071 b/changes/ticket40071 deleted file mode 100644 index 1e294a68e7..0000000000 --- a/changes/ticket40071 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (relay, address): - - Don't trigger an IP change if no new valid IP can be found. Fixes bug - 40071; bugfix on 0.4.5.1-alpha. - - When attempting to discover our IP, don't launch a descriptor fetch - anymore but rather a simple test circuit since the address discovery is - through the NETINFO cell now from the authorities. Fixes bug 40071; bugfix - on 0.4.5.1-alpha. diff --git a/changes/ticket40142 b/changes/ticket40142 deleted file mode 100644 index 25a96b3df3..0000000000 --- a/changes/ticket40142 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (logging, flow control): - - Turn a SENDME failure log warning into a debug. It can actually happen - naturally. Fixes bug 40142; bugfix on 0.4.1.1-alpha. diff --git a/changes/ticket40165 b/changes/ticket40165 deleted file mode 100644 index a8dd0a339b..0000000000 --- a/changes/ticket40165 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (compilation): - - Disable deprecation warnings when building with OpenSSL 3.0.0 or later. - There are a number of newly deprecated APIs in OpenSSL 3.0.0 that Tor - still requires. (A later version of Tor will try to stop depending on - these.) Closes ticket 40165. diff --git a/changes/ticket40170 b/changes/ticket40170 deleted file mode 100644 index cc1c8dbad1..0000000000 --- a/changes/ticket40170 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (tests): - - Fix the "tortls/openssl/log_one_error" test to work with OpenSSL 3.0.0. - Fixes bug 40170; bugfix on 0.2.8.1-alpha. diff --git a/changes/ticket40174 b/changes/ticket40174 deleted file mode 100644 index 869a2756f4..0000000000 --- a/changes/ticket40174 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (configure, build): - - With USDT tracing enabled, if STAP_PROBEV() is missing, don't attempt to - build. Linux supports that macro but not the BSDs. Fixes bug 40174; bugfix - on 0.4.5.1-alpha. diff --git a/changes/ticket40183 b/changes/ticket40183 deleted file mode 100644 index 3c4bdf21e2..0000000000 --- a/changes/ticket40183 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (port configuration): - - Second non ORPort of a different family (ex: SocksPort [::1]:9050) was - ignored due to a logical configuration parsing error. Fixes bug 40183; - bugfix on 0.4.5.1-alpha. diff --git a/changes/ticket40195 b/changes/ticket40195 deleted file mode 100644 index caa0bace94..0000000000 --- a/changes/ticket40195 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (configuration, ports): - - Fix an issue where an ORPort was validated against other type of ports - when it should have been only checked against other ORPorts. This lead to - "DirPort auto" to be ignored and failing to be used. Fixes bug 40195; - bugfix on 0.4.5.1-alpha.

1 0

[tor/master] copy 0.4.5.2-alpha changelog forward.
by nickm＠torproject.org 23 Nov '20

23 Nov '20

commit eb1a010476b77accf1d92a26caeddcdd31e5b913 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 23 14:10:46 2020 -0500 copy 0.4.5.2-alpha changelog forward. --- ChangeLog | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/ChangeLog b/ChangeLog index 88fd95f191..62e00c17c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,109 @@ +Changes in version 0.4.5.2-alpha - 2020-11-23 + Tor 0.4.5.2-alpha is the second alpha release in the 0.4.5.x series. + It fixes several bugs present in earlier releases, including one that + made it impractical to run relays on Windows. It also adds a few small + safety features to improve Tor's behavior in the presence of strange + compile-time options, misbehaving proxies, and future versions + of OpenSSL. + + o Major bugfixes (relay, windows): + - Fix a bug in our implementation of condition variables on Windows. + Previously, a relay on Windows would use 100% CPU after running + for some time. Because of this change, Tor now require Windows + Vista or later to build and run. Fixes bug 30187; bugfix on + 0.2.6.3-alpha. (This bug became more serious in 0.3.1.1-alpha with + the introduction of consensus diffs.) Patch by Daniel Pinto. + + o Minor features (compilation): + - Disable deprecation warnings when building with OpenSSL 3.0.0 or + later. There are a number of APIs newly deprecated in OpenSSL + 3.0.0 that Tor still requires. (A later version of Tor will try to + stop depending on these APIs.) Closes ticket 40165. + + o Minor features (protocol, proxy support, defense in depth): + - Respond more deliberately to misbehaving proxies that leave + leftover data on their connections, so as to make Tor even less + likely to allow the proxies to pass their data off as having come + from a relay. Closes ticket 40017. + + o Minor features (safety): + - Log a warning at startup if Tor is built with compile-time options + that are likely to make it less stable or reliable. Closes + ticket 18888. + + o Minor bugfixes (circuit, handshake): + - In the v3 handshaking code, use connection_or_change_state() to + change the state. Previously, we changed the state directly, but + this did not pass the state change to the pubsub or channel + objects, potentially leading to bugs. Fixes bug 32880; bugfix on + 0.2.3.6-alpha. Patch by Neel Chauhan. + + o Minor bugfixes (compilation): + - Use the correct 'ranlib' program when building libtor.a. + Previously we used the default ranlib, which broke some kinds of + cross-compilation. Fixes bug 40172; bugfix on 0.4.5.1-alpha. + - Remove a duplicate typedef in metrics_store.c. Fixes bug 40177; + bugfix on 0.4.5.1-alpha. + - When USDT tracing is enabled, and STAP_PROBEV() is missing, don't + attempt to build. Linux supports that macro but not the BSDs. + Fixes bug 40174; bugfix on 0.4.5.1-alpha. + + o Minor bugfixes (configuration): + - Exit Tor on a misconfiguration when the Bridge line is configured + to use a transport but no corresponding ClientTransportPlugin can + be found. Prior to this fix, Tor would attempt to connect to the + bridge directly without using the transport, making it easier for + adversaries to notice the bridge. Fixes bug 25528; bugfix + on 0.2.6.1-alpha. + - Fix an issue where an ORPort was compared with other kinds of + ports, when it should have been only checked against other + ORPorts. This bug would lead to "DirPort auto" getting ignored. + Fixes bug 40195; bugfix on 0.4.5.1-alpha. + - Fix a bug where a second non-ORPort with a variant family (ex: + SocksPort [::1]:9050) would be ignored due to a configuration + parsing error. Fixes bug 40183; bugfix on 0.4.5.1-alpha. + + o Minor bugfixes (crash, relay, signing key): + - Avoid assertion failures when we run Tor from the command line + with `--key-expiration sign`, but an ORPort is not set. Fixes bug + 40015; bugfix on 0.3.2.1-alpha. Patch by Neel Chauhan. + + o Minor bugfixes (logging): + - Remove trailing whitespace from control event log messages. Fixes + bug 32178; bugfix on 0.1.1.1-alpha. Based on a patch by + Amadeusz Pawlik. + - Turn warning-level log message about SENDME failure into a debug- + level message. (This event can happen naturally, and is no reason + for concern). Fixes bug 40142; bugfix on 0.4.1.1-alpha. + + o Minor bugfixes (relay, address discovery): + - Don't trigger an IP change when no new valid IP can be found. + Fixes bug 40071; bugfix on 0.4.5.1-alpha. + - When attempting to discover our IP, use a simple test circuit, + rather than a descriptor fetch: the same address information is + present in NETINFO cells, and is better authenticated there. Fixes + bug 40071; bugfix on 0.4.5.1-alpha. + + o Minor bugfixes (testing): + - Fix the `config/parse_tcp_proxy_line` test so that it works + correctly on systems where the DNS provider hijacks invalid + queries. Fixes part of bug 40179; bugfix on 0.4.3.1-alpha. + - Fix unit tests that used newly generated list of routers so that + they check them with respect to the date when they were generated, + not with respect to the current time. Fixes bug 40187; bugfix + on 0.4.5.1-alpha. + - Fix our Python reference-implementation for the v3 onion service + handshake so that it works correctly with the version of hashlib + provided by Python 3.9. Fixes part of bug 40179; bugfix + on 0.3.1.6-rc. + - Fix the `tortls/openssl/log_one_error` test to work with OpenSSL + 3.0.0. Fixes bug 40170; bugfix on 0.2.8.1-alpha. + + o Removed features (controller): + - Remove the "GETINFO network-status" controller command. It has + been deprecated since 0.3.1.1-alpha. Closes ticket 22473. + + Changes in version 0.4.4.6 - 2020-11-12 Tor 0.4.4.6 is the second stable release in the 0.4.4.x series. It backports fixes from later releases, including a fix for TROVE-2020-

1 0

[tor/master] fix two trivial comment mistakes
by arma＠torproject.org 23 Nov '20

23 Nov '20

commit 4f1e38ec8efee291668f8706ca946b0988f64352 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Nov 23 14:08:42 2020 -0500 fix two trivial comment mistakes --- src/core/or/connection_edge.c | 2 +- src/feature/nodelist/networkstatus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 859ad1c6fc..b2390e4f04 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -2209,7 +2209,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, } /* If this is a .exit hostname, strip off the .name.exit part, and - * see whether we're willing to connect there, and and otherwise handle the + * see whether we're willing to connect there, and otherwise handle the * .exit address. * * We'll set chosen_exit_name and/or close the connection as appropriate. diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index ece3c9e059..5deec01f82 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -240,7 +240,7 @@ networkstatus_get_cache_fname,(int flav, } /** - * Read and and return the cached consensus of type flavorname. If + * Read and return the cached consensus of type flavorname. If * unverified is false, get the one we haven't verified. Return NULL if * the file isn't there. */ static tor_mmap_t *

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by nickm＠torproject.org 23 Nov '20

23 Nov '20

commit 366bb3c427f1878bf4b0b0a41d45844c924dfb49 Merge: 135b8eea36 2f87b2ab75 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 23 14:04:35 2020 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.5] bump to 0.4.5.2-alpha-dev
by nickm＠torproject.org 23 Nov '20

23 Nov '20

commit 2f87b2ab75e29cbd9ee2989c5e7739234818e4d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 23 14:03:14 2020 -0500 bump to 0.4.5.2-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 8dd5120b90..6eb09db429 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.5.2-alpha]) +AC_INIT([tor],[0.4.5.2-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-21"], # for 0.4.5.2-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-23"], # for 0.4.5.2-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index b17e1175cf..e541a81753 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.5.2-alpha" +!define VERSION "0.4.5.2-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 9ee583f564..8b75a15ac6 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.5.2-alpha" +#define VERSION "0.4.5.2-alpha-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.5] bump to 0.4.5.2-alpha-dev
by nickm＠torproject.org 23 Nov '20

23 Nov '20

commit 2f87b2ab75e29cbd9ee2989c5e7739234818e4d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 23 14:03:14 2020 -0500 bump to 0.4.5.2-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 8dd5120b90..6eb09db429 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.5.2-alpha]) +AC_INIT([tor],[0.4.5.2-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-21"], # for 0.4.5.2-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-23"], # for 0.4.5.2-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index b17e1175cf..e541a81753 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.5.2-alpha" +!define VERSION "0.4.5.2-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 9ee583f564..8b75a15ac6 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.5.2-alpha" +#define VERSION "0.4.5.2-alpha-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/master] bump to 0.4.5.2-alpha-dev
by nickm＠torproject.org 23 Nov '20

23 Nov '20

commit 2f87b2ab75e29cbd9ee2989c5e7739234818e4d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 23 14:03:14 2020 -0500 bump to 0.4.5.2-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 8dd5120b90..6eb09db429 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.5.2-alpha]) +AC_INIT([tor],[0.4.5.2-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-21"], # for 0.4.5.2-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-23"], # for 0.4.5.2-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index b17e1175cf..e541a81753 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.5.2-alpha" +!define VERSION "0.4.5.2-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 9ee583f564..8b75a15ac6 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.5.2-alpha" +#define VERSION "0.4.5.2-alpha-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0