[tor-commits] [tpo/master] Add new Tor Browser version 9.5.1
commit c7f6502de1e9b80c4cd9e1e1a89b8b518e94f391 Author: Matthew Finkel Date: Wed Jul 1 03:26:18 2020 + Add new Tor Browser version 9.5.1 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 databags/versions.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 70c945b9..0f545ce0 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -9,6 +9,10 @@ body: "9.5-MacOS", "9.5-Linux", "9.5-Windows", +"9.5.1", +"9.5.1-MacOS", +"9.5.1-Linux", +"9.5.1-Windows", "10.0a1", "10.0a1-MacOS", "10.0a1-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index 5d674928..b1aaf537 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,5 +1,5 @@ [torbrowser-stable] -version = 9.5 +version = 9.5.1 win32 = 0.4.3.5 [torbrowser-alpha] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Add new Tor Browser version 10.0a2
commit 6e436207b02059aa0e7341a3df485fad4d0710f7 Author: Matthew Finkel Date: Wed Jul 1 03:27:16 2020 + Add new Tor Browser version 10.0a2 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +- databags/versions.ini | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 0f545ce0..d54369c4 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -16,5 +16,9 @@ body: "10.0a1", "10.0a1-MacOS", "10.0a1-Linux", -"10.0a1-Windows" +"10.0a1-Windows", +"10.0a2", +"10.0a2-MacOS", +"10.0a2-Linux", +"10.0a2-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index b1aaf537..65455ff4 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 9.5.1 win32 = 0.4.3.5 [torbrowser-alpha] -version = 10.0a1 +version = 10.0a2 [tor-stable] version = 0.4.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Add text heading
commit 8e5137c50171fd860bdf8d81fcce87e1c0ed995f Author: gus Date: Tue Jun 30 18:20:48 2020 -0400 Add text heading --- .../contents.lr| 184 + .../text/contents.lr | 130 +++ 2 files changed, 314 insertions(+) diff --git a/content/archive/tor-browser-makes-onion-services-easier-to-find-use/contents.lr b/content/archive/tor-browser-makes-onion-services-easier-to-find-use/contents.lr new file mode 100644 index 000..e43e69e --- /dev/null +++ b/content/archive/tor-browser-makes-onion-services-easier-to-find-use/contents.lr @@ -0,0 +1,184 @@ +title: Tor Browser 9.5 makes onion services easier to find and use +--- +author: newslet...@torproject.org +--- +pub_date: 2020-06-30 +--- +_template: newsletter.html +--- +body: +--- +html_body: + + + + + + + + + https://torproject.org;>https://blog.torproject.org/sites/default/files/inline-images/tor-news-logo-560.png; style="width: 250px; height: 75px;" /> + + + + + + + + + + + + + Tor Browser 9.5 makes onion services easier to find and use + + https://blog.torproject.org/new-release-tor-browser-95;>https://blog.torproject.org/sites/default/files/styles/full_width/public/image/95%402x.png?itok=MSurYZ1O; style="width: 640px; height: 312px;" /> + + Tors onion routing remains the best way to achieve end-to-end anonymous communication on the internet. With onion services (.onion addresses), website administrators can provide their users with anonymous connections that are metadata-free or that hide metadata from any third party. Onion services are also one of the few censorship circumvention technologies that allow users to route around censorship while simultaneously protecting their privacy and identity. + + With our latest https://blog.torproject.org/new-release-tor-browser-95;>Tor Browser release, weve made onion services easier to discover, remember, and use. Heres whats new: + + Onion Location + + Website publishers now can advertise their onion service to Tor users by adding an HTTP header. When https://support.torproject.org; rel="noopener" target="_blank">visiting a website that has both an http://4bflp2c4tnynnbes.onion; rel="noopener" target="_blank"> .onion address and Onion Location enabled via Tor Browser, users will be prompted about the onion service version of the site and will be asked to opt-in to upgrade to the onion service on their first use. + + Onion Authentication + + Onion services administrators who want to add an extra layer of security to their website can now set a pair of keys for access control and authentication. Tor Browser users can save keys and manage them via about:preferences#privacy in the Onion Services Authentication section. + + URL Bar Security Indicators + + Browsers traditionally rendered sites delivered via a secure transport protocol with a green lock icon. But in mid-2019, the https://blog.mozilla.org/security/2019/10/15/improved-security-and-privacy-indicators-in-firefox-70/; rel="noopener noreferrer"
[tor-commits] [translation/whisperback_completed] https://gitweb.torproject.org/translation.git/commit/?h=whisperback_completed
commit 505243bc85709a0a84ceae22b5a3075e9c98279b Author: Translation commit bot Date: Tue Jun 30 18:48:04 2020 + https://gitweb.torproject.org/translation.git/commit/?h=whisperback_completed --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po b/fr/fr.po index 0d019c1e49..f50ba2276c 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2020-06-30 18:13+\n" +"PO-Revision-Date: 2020-06-30 18:18+\n" "Last-Translator: AO \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck] https://gitweb.torproject.org/translation.git/commit/?h=torcheck
commit 240824f37924737b90e1933715af0573891e063a Author: Translation commit bot Date: Tue Jun 30 18:47:36 2020 + https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- fr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 47d4a83e45..90e46bf367 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2020-06-29 14:55+\n" +"PO-Revision-Date: 2020-06-30 18:18+\n" "Last-Translator: AO \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
commit a207ea8f2945150f99091e899c765e4c30807f9c Author: Translation commit bot Date: Tue Jun 30 18:47:43 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties --- fr/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index 38afc38066..b1381ca803 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -45,7 +45,7 @@ torlauncher.no_bridges_available=Aucun pont nâest proposé pour lâinstant. D torlauncher.connect=Se connecter torlauncher.restart_tor=Redémarrer Tor torlauncher.quit=Fermer -torlauncher.quit_win=Sortie +torlauncher.quit_win=Sortir torlauncher.done=Terminé torlauncher.forAssistance=Pour de lâassistance, contacter %S ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck_completed] https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed
commit a2912393a6e45ea4fe849e15e6a107699a04f78f Author: Translation commit bot Date: Tue Jun 30 18:47:42 2020 + https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed --- fr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 47d4a83e45..90e46bf367 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2020-06-29 14:55+\n" +"PO-Revision-Date: 2020-06-30 18:18+\n" "Last-Translator: AO \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback
commit 705de774c4cc8b76be3dc5e606629396fe89e103 Author: Translation commit bot Date: Tue Jun 30 18:48:00 2020 + https://gitweb.torproject.org/translation.git/commit/?h=whisperback --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po b/fr/fr.po index 0d019c1e49..f50ba2276c 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2020-06-30 18:13+\n" +"PO-Revision-Date: 2020-06-30 18:18+\n" "Last-Translator: AO \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
commit 74c1bef10b4ddb8b7ea5029f8d104e4f8095e0b8 Author: Translation commit bot Date: Tue Jun 30 18:47:46 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed --- fr/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index 38afc38066..b1381ca803 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -45,7 +45,7 @@ torlauncher.no_bridges_available=Aucun pont nâest proposé pour lâinstant. D torlauncher.connect=Se connecter torlauncher.restart_tor=Redémarrer Tor torlauncher.quit=Fermer -torlauncher.quit_win=Sortie +torlauncher.quit_win=Sortir torlauncher.done=Terminé torlauncher.forAssistance=Pour de lâassistance, contacter %S ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket40009_045_01'
commit 8dd9097bdc69c78c1665394408347d33666358ff Merge: 081d84c1d ec57cbf17 Author: Nick Mathewson Date: Tue Jun 30 14:35:25 2020 -0400 Merge remote-tracking branch 'dgoulet/ticket40009_045_01' scripts/maint/rename_c_identifier.py | 2 +- src/app/config/resolve_addr.c| 26 -- src/feature/client/entrynodes.c | 2 +- src/feature/nodelist/nodelist.c | 10 +- src/feature/nodelist/nodelist.h | 2 +- src/test/test_address.c | 10 +- 6 files changed, 33 insertions(+), 19 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] node: Rename addrs_in_same_network_family()
commit 2ac2ba4e2c67a5c3266656c6ad525eb2c056da79
Author: David Goulet
Date: Tue Jun 30 13:46:53 2020 -0400
node: Rename addrs_in_same_network_family()
New name reflects that the function is only used to compare router addresses
in order to learn if they are in the same network.
The network check is /16 and /32 respectively for IPv4 and IPv6.
Related to #40009
Signed-off-by: David Goulet
---
src/feature/client/entrynodes.c | 2 +-
src/feature/nodelist/nodelist.c | 10 +-
src/feature/nodelist/nodelist.h | 2 +-
src/test/test_address.c | 10 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 223815e7b..6e8259142 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -1554,7 +1554,7 @@ guard_in_node_family(const entry_guard_t *guard, const
node_t *node)
if (get_options()->EnforceDistinctSubnets && guard->bridge_addr) {
tor_addr_t node_addr;
node_get_addr(node, _addr);
- if (addrs_in_same_network_family(_addr,
+ if (router_addrs_in_same_network(_addr,
>bridge_addr->addr)) {
return 1;
}
diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c
index dd6c65661..a3c94554e 100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@ -2034,7 +2034,7 @@ nodelist_refresh_countries(void)
/** Return true iff router1 and router2 have similar enough network addresses
* that we should treat them as being in the same family */
int
-addrs_in_same_network_family(const tor_addr_t *a1,
+router_addrs_in_same_network(const tor_addr_t *a1,
const tor_addr_t *a2)
{
if (tor_addr_is_null(a1) || tor_addr_is_null(a2))
@@ -2150,8 +2150,8 @@ nodes_in_same_family(const node_t *node1, const node_t
*node2)
node_get_pref_ipv6_orport(node1, _1);
node_get_pref_ipv6_orport(node2, _2);
-if (addrs_in_same_network_family(, ) ||
-addrs_in_same_network_family(_1.addr, _2.addr))
+if (router_addrs_in_same_network(, ) ||
+router_addrs_in_same_network(_1.addr, _2.addr))
return 1;
}
@@ -2209,8 +2209,8 @@ nodelist_add_node_and_family(smartlist_t *sl, const
node_t *node)
tor_addr_port_t ap6;
node_get_addr(node2, );
node_get_pref_ipv6_orport(node2, );
- if (addrs_in_same_network_family(, _addr) ||
- addrs_in_same_network_family(, _ap6.addr))
+ if (router_addrs_in_same_network(, _addr) ||
+ router_addrs_in_same_network(, _ap6.addr))
smartlist_add(sl, (void*)node2);
} SMARTLIST_FOREACH_END(node2);
}
diff --git a/src/feature/nodelist/nodelist.h b/src/feature/nodelist/nodelist.h
index 826d1b957..06cd7916f 100644
--- a/src/feature/nodelist/nodelist.h
+++ b/src/feature/nodelist/nodelist.h
@@ -128,7 +128,7 @@ int node_is_unreliable(const node_t *router, int
need_uptime,
int router_exit_policy_all_nodes_reject(const tor_addr_t *addr, uint16_t port,
int need_uptime);
void router_set_status(const char *digest, int up);
-int addrs_in_same_network_family(const tor_addr_t *a1,
+int router_addrs_in_same_network(const tor_addr_t *a1,
const tor_addr_t *a2);
/** router_have_minimum_dir_info tests to see if we have enough
diff --git a/src/test/test_address.c b/src/test/test_address.c
index 4cedbda34..8a4663008 100644
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@ -1152,23 +1152,23 @@ test_address_tor_addr_in_same_network_family(void
*ignored)
tor_addr_parse(, "8.8.8.8");
tor_addr_parse(, "8.8.4.4");
- tt_int_op(addrs_in_same_network_family(, ), OP_EQ, 1);
+ tt_int_op(router_addrs_in_same_network(, ), OP_EQ, 1);
tor_addr_parse(, "8.8.8.8");
tor_addr_parse(, "1.1.1.1");
- tt_int_op(addrs_in_same_network_family(, ), OP_EQ, 0);
+ tt_int_op(router_addrs_in_same_network(, ), OP_EQ, 0);
tor_addr_parse(, "8.8.8.8");
tor_addr_parse(, "2001:4860:4860::8844");
- tt_int_op(addrs_in_same_network_family(, ), OP_EQ, 0);
+ tt_int_op(router_addrs_in_same_network(, ), OP_EQ, 0);
tor_addr_parse(, "2001:4860:4860::");
tor_addr_parse(, "2001:4860:4860::8844");
- tt_int_op(addrs_in_same_network_family(, ), OP_EQ, 1);
+ tt_int_op(router_addrs_in_same_network(, ), OP_EQ, 1);
tor_addr_parse(, "2001:4860:4860::");
tor_addr_parse(, "2001:470:20::2");
- tt_int_op(addrs_in_same_network_family(, ), OP_EQ, 0);
+ tt_int_op(router_addrs_in_same_network(, ), OP_EQ, 0);
done:
return;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] addr: Document better is_local_addr_to_resolve_addr()
commit ec57cbf179257bc56b6649e30855a550eb110cd4
Author: David Goulet
Date: Tue Jun 30 09:32:21 2020 -0400
addr: Document better is_local_addr_to_resolve_addr()
This function is about learning if a given address is local to us as in the
resolved address as a relay.
Closes #40009
Signed-off-by: David Goulet
---
src/app/config/resolve_addr.c | 26 --
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c
index c8b44de84..8224e8868 100644
--- a/src/app/config/resolve_addr.c
+++ b/src/app/config/resolve_addr.c
@@ -568,8 +568,26 @@ find_my_address(const or_options_t *options, int family,
int warn_severity,
return true;
}
-/** Return true iff addr is judged to be on the same network as us, or
- * on a private network.
+/** @brief: Return true iff the given addr is judged to be local to our
+ * resolved address.
+ *
+ * This function is used to tell whether another address is 'remote' enough
+ * that we can trust it when it tells us that we are reachable, or that we
+ * have a certain address."
+ *
+ * The criterion to learn if the address is local are the following:
+ *
+ *1. Internal address.
+ *2. If EnforceDistinctSubnets is set then it is never local.
+ *3. Network mask is compared. IPv4: /24 and IPv6 /48. This is different
+ * from the path selection that looks at /16 and /32 because we only
+ * want to learn here if the address is considered to come from the
+ * Internet basically.
+ *
+ * @param addr The address to test if local and also test against our resovled
+ * address.
+ *
+ * @return True iff address is considered local or else False.
*/
MOCK_IMPL(bool,
is_local_to_resolve_addr, (const tor_addr_t *addr))
@@ -589,10 +607,6 @@ is_local_to_resolve_addr, (const tor_addr_t *addr))
switch (family) {
case AF_INET:
-/* XXX: Why is this /24 and not /16 which the rest of tor does? Unknown
- * reasons at the moment highlighted in ticket #40009. Because of that, we
- * can't use addrs_in_same_network_family(). */
-
/* It's possible that this next check will hit before the first time
* find_my_address actually succeeds. For clients, it is likely that
* find_my_address will never be called at all. In those cases,
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] scripts: Fix rename_c_identifier.py uncommitted warning
commit 7a6e1f2491094fbf705e2ef4b3fd770faf48f1b7
Author: David Goulet
Date: Tue Jun 30 13:45:16 2020 -0400
scripts: Fix rename_c_identifier.py uncommitted warning
Only warn when we actually want a commit _and_ there are uncommitted changes
found. Else, it is fine to rename if the script is not creating a commit.
Signed-off-by: David Goulet
---
scripts/maint/rename_c_identifier.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/maint/rename_c_identifier.py
b/scripts/maint/rename_c_identifier.py
index 77802e10f..779468930 100755
--- a/scripts/maint/rename_c_identifier.py
+++ b/scripts/maint/rename_c_identifier.py
@@ -239,7 +239,7 @@ def main(argv):
print("I require an even number of identifiers.", file=sys.stderr)
return 1
-if any_uncommitted_changes():
+if args.commit and any_uncommitted_changes():
print("Uncommitted changes found. Not running.", file=sys.stderr)
return 1
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] resolve_addr.c: remove a needless quote mark
commit 8f59b3e6f2a908818f16516e2f4729e4425bae11 Author: Nick Mathewson Date: Tue Jun 30 14:36:11 2020 -0400 resolve_addr.c: remove a needless quote mark --- src/app/config/resolve_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 8224e8868..bf462c202 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -573,7 +573,7 @@ find_my_address(const or_options_t *options, int family, int warn_severity, * * This function is used to tell whether another address is 'remote' enough * that we can trust it when it tells us that we are reachable, or that we - * have a certain address." + * have a certain address. * * The criterion to learn if the address is local are the following: * ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
commit f226b1dc56affd59488374fb013f1d51a003eb68 Author: Translation commit bot Date: Tue Jun 30 18:17:26 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed --- fr/torlauncher.properties | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index 8549565e70..38afc38066 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -7,23 +7,23 @@ torlauncher.tor_exited_during_startup=Tor sâest fermé pendant le démarrage. torlauncher.tor_exited=Tor sâest fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusquâà ce que vous redémarriez Tor, le Navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal Tor à lâéquipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera pas les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. -torlauncher.tor_failed_to_start=Tor nâa pas pu démarrer. +torlauncher.tor_failed_to_start=Ãchec de démarrage de Tor. torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué. torlauncher.tor_bootstrap_failed=Ãchec lors de la connexion de Tor au réseau Tor. torlauncher.tor_bootstrap_failed_details=Lâétape %1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S -torlauncher.tor_missing=Il manque lâexécutable Tor. +torlauncher.tor_missing=Il manque lâexécutable de Tor. torlauncher.torrc_missing=Le fichier torrc manque et nâa pas pu être créé. torlauncher.datadir_missing=Le répertoire de données de Tor nâexiste pas et nâa pas pu être créé. torlauncher.onionauthdir_missing=Le répertoire dâauthentification onion de Tor nâexiste pas et nâa pas pu être créé. -torlauncher.password_hash_missing=Impossible dâobtenir le mot de passe haché. +torlauncher.password_hash_missing=Ãchec dâobtention du mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S torlauncher.failed_to_save_settings=Impossible dâenregistrer les paramètres de Tor.\n\n%S -torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne. +torlauncher.ensure_tor_is_running=Veuillez vous assurer que Tor fonctionne. -torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom dâhôte et un numéro de port afin de configurer Tor pour quâil utilise un mandataire pour accéder à Internet. +torlauncher.error_proxy_addr_missing=Vous devez indiquer une adresse IP ou un nom d'hôte et un numéro de port pour que Tor puisse utiliser un mandataire afin dâaccéder à Internet. torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts. torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts fournis. @@ -44,7 +44,7 @@ torlauncher.no_bridges_available=Aucun pont nâest proposé pour lâinstant. D torlauncher.connect=Se connecter torlauncher.restart_tor=Redémarrer Tor -torlauncher.quit=Quitter +torlauncher.quit=Fermer torlauncher.quit_win=Sortie torlauncher.done=Terminé ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback
commit 9ef96123b560ab41bacdf8ed657b037ed2c93750 Author: Translation commit bot Date: Tue Jun 30 18:17:38 2020 + https://gitweb.torproject.org/translation.git/commit/?h=whisperback --- fr/fr.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 9a70baa7a8..0d019c1e49 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,10 +3,10 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# AO , 2015,2018-2019 -# arpalord , 2012 +# AO , 2015,2018-2020 +# 4c6ce9952c5260c09c52a2847598402a_b451c51 <586e15927c43f46ef10f0dcb0660dbc3_11384>, 2012 # arpalord , 2012 -# arpalord , 2012 +# 4c6ce9952c5260c09c52a2847598402a_b451c51 <586e15927c43f46ef10f0dcb0660dbc3_11384>, 2012 # Brendan Abolivier , 2018 # AO , 2017-2018 # French language coordinator , 2015-2017 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2019-10-28 16:28+\n" +"PO-Revision-Date: 2020-06-30 18:13+\n" "Last-Translator: AO \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -44,7 +44,7 @@ msgstr "Clé OpenPGP de contact invalide : %s" #: ../whisperBack/whisperback.py:85 msgid "Invalid contact OpenPGP public key block" -msgstr "Bloc de clé publique OpenPGP de contact invalide" +msgstr "Le bloc de clé publique OpenPGP du contact est invalide" #: ../whisperBack/exceptions.py:41 #, python-format ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
commit 13d2f1189a59f39edf86f284080ea7cddaacd9d9 Author: Translation commit bot Date: Tue Jun 30 18:17:24 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties --- fr/torlauncher.properties | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index 8549565e70..38afc38066 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -7,23 +7,23 @@ torlauncher.tor_exited_during_startup=Tor sâest fermé pendant le démarrage. torlauncher.tor_exited=Tor sâest fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusquâà ce que vous redémarriez Tor, le Navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal Tor à lâéquipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera pas les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. -torlauncher.tor_failed_to_start=Tor nâa pas pu démarrer. +torlauncher.tor_failed_to_start=Ãchec de démarrage de Tor. torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué. torlauncher.tor_bootstrap_failed=Ãchec lors de la connexion de Tor au réseau Tor. torlauncher.tor_bootstrap_failed_details=Lâétape %1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S -torlauncher.tor_missing=Il manque lâexécutable Tor. +torlauncher.tor_missing=Il manque lâexécutable de Tor. torlauncher.torrc_missing=Le fichier torrc manque et nâa pas pu être créé. torlauncher.datadir_missing=Le répertoire de données de Tor nâexiste pas et nâa pas pu être créé. torlauncher.onionauthdir_missing=Le répertoire dâauthentification onion de Tor nâexiste pas et nâa pas pu être créé. -torlauncher.password_hash_missing=Impossible dâobtenir le mot de passe haché. +torlauncher.password_hash_missing=Ãchec dâobtention du mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S torlauncher.failed_to_save_settings=Impossible dâenregistrer les paramètres de Tor.\n\n%S -torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne. +torlauncher.ensure_tor_is_running=Veuillez vous assurer que Tor fonctionne. -torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom dâhôte et un numéro de port afin de configurer Tor pour quâil utilise un mandataire pour accéder à Internet. +torlauncher.error_proxy_addr_missing=Vous devez indiquer une adresse IP ou un nom d'hôte et un numéro de port pour que Tor puisse utiliser un mandataire afin dâaccéder à Internet. torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts. torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts fournis. @@ -44,7 +44,7 @@ torlauncher.no_bridges_available=Aucun pont nâest proposé pour lâinstant. D torlauncher.connect=Se connecter torlauncher.restart_tor=Redémarrer Tor -torlauncher.quit=Quitter +torlauncher.quit=Fermer torlauncher.quit_win=Sortie torlauncher.done=Terminé ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback_completed] https://gitweb.torproject.org/translation.git/commit/?h=whisperback_completed
commit e480456b32595f11708d9cee7d320c7c4ca8f0d4 Author: Translation commit bot Date: Tue Jun 30 18:17:42 2020 + https://gitweb.torproject.org/translation.git/commit/?h=whisperback_completed --- fr/fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 923bbb0596..0d019c1e49 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# AO , 2015,2018-2019 +# AO , 2015,2018-2020 # 4c6ce9952c5260c09c52a2847598402a_b451c51 <586e15927c43f46ef10f0dcb0660dbc3_11384>, 2012 # arpalord , 2012 # 4c6ce9952c5260c09c52a2847598402a_b451c51 <586e15927c43f46ef10f0dcb0660dbc3_11384>, 2012 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2019-10-28 16:28+\n" +"PO-Revision-Date: 2020-06-30 18:13+\n" "Last-Translator: AO \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -44,7 +44,7 @@ msgstr "Clé OpenPGP de contact invalide : %s" #: ../whisperBack/whisperback.py:85 msgid "Invalid contact OpenPGP public key block" -msgstr "Bloc de clé publique OpenPGP de contact invalide" +msgstr "Le bloc de clé publique OpenPGP du contact est invalide" #: ../whisperBack/exceptions.py:41 #, python-format ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
commit 5b11128de05275145ed48f4aef5e02afd757bfd8 Merge: ed85f0041 9638c6d7a Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 322abd4fd9ce7e3d60f10e1ef4d343c42d14a9ba Merge: 5a38c73f7 dbb70d85b Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 322abd4fd9ce7e3d60f10e1ef4d343c42d14a9ba Merge: 5a38c73f7 dbb70d85b Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'tor-github/pr/1909' into maint-0.3.5
commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy Date: Tue Jun 30 14:23:17 2020 + Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'tor-github/pr/1909' into maint-0.3.5
commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy Date: Tue Jun 30 14:23:17 2020 + Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
commit dbb70d85bf65d33e0a1035146d71a2a610e91056 Merge: 881f50a9a 8697205be Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 9638c6d7a7c9de5336eab16eb013f97a62c75022 Merge: 0d5152fc5 322abd4fd Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2
commit dbb70d85bf65d33e0a1035146d71a2a610e91056 Merge: 881f50a9a 8697205be Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 9638c6d7a7c9de5336eab16eb013f97a62c75022 Merge: 0d5152fc5 322abd4fd Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 322abd4fd9ce7e3d60f10e1ef4d343c42d14a9ba Merge: 5a38c73f7 dbb70d85b Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
commit dbb70d85bf65d33e0a1035146d71a2a610e91056 Merge: 881f50a9a 8697205be Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
commit be17fa169321d2c69618d4636ac5e1f1fc3a4cb8 Merge: ff4bd6699 322abd4fd Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.4] Merge branch 'tor-github/pr/1909' into maint-0.3.5
commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy Date: Tue Jun 30 14:23:17 2020 + Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
commit dbb70d85bf65d33e0a1035146d71a2a610e91056 Merge: 881f50a9a 8697205be Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
commit dbb70d85bf65d33e0a1035146d71a2a610e91056 Merge: 881f50a9a 8697205be Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'tor-github/pr/1909' into maint-0.3.5
commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy Date: Tue Jun 30 14:23:17 2020 + Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.4'
commit 081d84c1de4cbf44bcac7afa0ab7417728052946 Merge: 90c313e87 9638c6d7a Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.4' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 9638c6d7a7c9de5336eab16eb013f97a62c75022 Merge: 0d5152fc5 322abd4fd Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Preemptive circs should work with UseEntryGuards 0
commit 39f2411b3f5ab1a50c74fdafb432d5286c451ab7
Author: Roger Dingledine
Date: Sat May 30 01:54:22 2020 -0400
Preemptive circs should work with UseEntryGuards 0
Resume being willing to use preemptively-built circuits when
UseEntryGuards is set to 0. We accidentally disabled this feature with
that config setting (in our fix for #24469), leading to slower load times.
Fixes bug 34303; bugfix on 0.3.3.2-alpha.
---
changes/bug34303| 5 +
src/core/or/circuitlist.c | 2 +-
src/feature/client/entrynodes.c | 8 +++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/changes/bug34303 b/changes/bug34303
new file mode 100644
index 0..dce57f464
--- /dev/null
+++ b/changes/bug34303
@@ -0,0 +1,5 @@
+ o Minor bugfixes (client performance):
+- Resume being willing to use preemptively-built circuits when
+ UseEntryGuards is set to 0. We accidentally disabled this feature
+ with that config setting, leading to slower load times. Fixes bug
+ 34303; bugfix on 0.3.3.2-alpha.
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index be5ac3b7f..03d495cdf 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -1883,7 +1883,7 @@ circuit_find_to_cannibalize(uint8_t purpose_to_produce,
extend_info_t *info,
}
/* Ignore any circuits for which we can't use the Guard. It is possible
- * that the Guard was removed from the samepled set after the circuit
+ * that the Guard was removed from the sampled set after the circuit
* was created so avoid using it. */
if (!entry_guard_could_succeed(circ->guard_state)) {
goto next;
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 7c2159ce8..8d9230b66 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -3452,10 +3452,16 @@ entry_guards_update_state(or_state_t *state)
entry_guards_dirty = 0;
}
-/** Return true iff the circuit's guard can succeed that is can be used. */
+/** Return true iff the circuit's guard can succeed, that is, can be used. */
int
entry_guard_could_succeed(const circuit_guard_state_t *guard_state)
{
+ if (get_options()->UseEntryGuards == 0) {
+/* we're fine with this circuit's first hop, because we're not
+ * configured to use entry guards. */
+return 1;
+ }
+
if (!guard_state) {
return 0;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 322abd4fd9ce7e3d60f10e1ef4d343c42d14a9ba Merge: 5a38c73f7 dbb70d85b Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'tor-github/pr/1909' into maint-0.3.5
commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy Date: Tue Jun 30 14:23:17 2020 + Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
commit 7d833ee33458d93adaeeccbb88cce98738a96f6a Merge: 511e1cfde dbb70d85b Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'tor-github/pr/1909' into maint-0.3.5
commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy Date: Tue Jun 30 14:23:17 2020 + Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.3] Merge branch 'tor-github/pr/1909' into maint-0.3.5
commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy Date: Tue Jun 30 14:23:17 2020 + Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
commit dbb70d85bf65d33e0a1035146d71a2a610e91056 Merge: 881f50a9a 8697205be Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Preemptive circs should work with UseEntryGuards 0
commit 39f2411b3f5ab1a50c74fdafb432d5286c451ab7
Author: Roger Dingledine
Date: Sat May 30 01:54:22 2020 -0400
Preemptive circs should work with UseEntryGuards 0
Resume being willing to use preemptively-built circuits when
UseEntryGuards is set to 0. We accidentally disabled this feature with
that config setting (in our fix for #24469), leading to slower load times.
Fixes bug 34303; bugfix on 0.3.3.2-alpha.
---
changes/bug34303| 5 +
src/core/or/circuitlist.c | 2 +-
src/feature/client/entrynodes.c | 8 +++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/changes/bug34303 b/changes/bug34303
new file mode 100644
index 0..dce57f464
--- /dev/null
+++ b/changes/bug34303
@@ -0,0 +1,5 @@
+ o Minor bugfixes (client performance):
+- Resume being willing to use preemptively-built circuits when
+ UseEntryGuards is set to 0. We accidentally disabled this feature
+ with that config setting, leading to slower load times. Fixes bug
+ 34303; bugfix on 0.3.3.2-alpha.
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index be5ac3b7f..03d495cdf 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -1883,7 +1883,7 @@ circuit_find_to_cannibalize(uint8_t purpose_to_produce,
extend_info_t *info,
}
/* Ignore any circuits for which we can't use the Guard. It is possible
- * that the Guard was removed from the samepled set after the circuit
+ * that the Guard was removed from the sampled set after the circuit
* was created so avoid using it. */
if (!entry_guard_could_succeed(circ->guard_state)) {
goto next;
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 7c2159ce8..8d9230b66 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -3452,10 +3452,16 @@ entry_guards_update_state(or_state_t *state)
entry_guards_dirty = 0;
}
-/** Return true iff the circuit's guard can succeed that is can be used. */
+/** Return true iff the circuit's guard can succeed, that is, can be used. */
int
entry_guard_could_succeed(const circuit_guard_state_t *guard_state)
{
+ if (get_options()->UseEntryGuards == 0) {
+/* we're fine with this circuit's first hop, because we're not
+ * configured to use entry guards. */
+return 1;
+ }
+
if (!guard_state) {
return 0;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 34ca6b133710d3d2ac75debcbc4005585a2c2656 Merge: 62727a4ad 8697205be Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 322abd4fd9ce7e3d60f10e1ef4d343c42d14a9ba Merge: 5a38c73f7 dbb70d85b Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Merge branch 'tor-github/pr/1909' into maint-0.3.5
commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy Date: Tue Jun 30 14:23:17 2020 + Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] Merge branch 'tor-github/pr/1909' into maint-0.3.5
commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy Date: Tue Jun 30 14:23:17 2020 + Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
commit dbb70d85bf65d33e0a1035146d71a2a610e91056 Merge: 881f50a9a 8697205be Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] Preemptive circs should work with UseEntryGuards 0
commit 39f2411b3f5ab1a50c74fdafb432d5286c451ab7
Author: Roger Dingledine
Date: Sat May 30 01:54:22 2020 -0400
Preemptive circs should work with UseEntryGuards 0
Resume being willing to use preemptively-built circuits when
UseEntryGuards is set to 0. We accidentally disabled this feature with
that config setting (in our fix for #24469), leading to slower load times.
Fixes bug 34303; bugfix on 0.3.3.2-alpha.
---
changes/bug34303| 5 +
src/core/or/circuitlist.c | 2 +-
src/feature/client/entrynodes.c | 8 +++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/changes/bug34303 b/changes/bug34303
new file mode 100644
index 0..dce57f464
--- /dev/null
+++ b/changes/bug34303
@@ -0,0 +1,5 @@
+ o Minor bugfixes (client performance):
+- Resume being willing to use preemptively-built circuits when
+ UseEntryGuards is set to 0. We accidentally disabled this feature
+ with that config setting, leading to slower load times. Fixes bug
+ 34303; bugfix on 0.3.3.2-alpha.
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index be5ac3b7f..03d495cdf 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -1883,7 +1883,7 @@ circuit_find_to_cannibalize(uint8_t purpose_to_produce,
extend_info_t *info,
}
/* Ignore any circuits for which we can't use the Guard. It is possible
- * that the Guard was removed from the samepled set after the circuit
+ * that the Guard was removed from the sampled set after the circuit
* was created so avoid using it. */
if (!entry_guard_could_succeed(circ->guard_state)) {
goto next;
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 7c2159ce8..8d9230b66 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -3452,10 +3452,16 @@ entry_guards_update_state(or_state_t *state)
entry_guards_dirty = 0;
}
-/** Return true iff the circuit's guard can succeed that is can be used. */
+/** Return true iff the circuit's guard can succeed, that is, can be used. */
int
entry_guard_could_succeed(const circuit_guard_state_t *guard_state)
{
+ if (get_options()->UseEntryGuards == 0) {
+/* we're fine with this circuit's first hop, because we're not
+ * configured to use entry guards. */
+return 1;
+ }
+
if (!guard_state) {
return 0;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Preemptive circs should work with UseEntryGuards 0
commit 39f2411b3f5ab1a50c74fdafb432d5286c451ab7
Author: Roger Dingledine
Date: Sat May 30 01:54:22 2020 -0400
Preemptive circs should work with UseEntryGuards 0
Resume being willing to use preemptively-built circuits when
UseEntryGuards is set to 0. We accidentally disabled this feature with
that config setting (in our fix for #24469), leading to slower load times.
Fixes bug 34303; bugfix on 0.3.3.2-alpha.
---
changes/bug34303| 5 +
src/core/or/circuitlist.c | 2 +-
src/feature/client/entrynodes.c | 8 +++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/changes/bug34303 b/changes/bug34303
new file mode 100644
index 0..dce57f464
--- /dev/null
+++ b/changes/bug34303
@@ -0,0 +1,5 @@
+ o Minor bugfixes (client performance):
+- Resume being willing to use preemptively-built circuits when
+ UseEntryGuards is set to 0. We accidentally disabled this feature
+ with that config setting, leading to slower load times. Fixes bug
+ 34303; bugfix on 0.3.3.2-alpha.
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index be5ac3b7f..03d495cdf 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -1883,7 +1883,7 @@ circuit_find_to_cannibalize(uint8_t purpose_to_produce,
extend_info_t *info,
}
/* Ignore any circuits for which we can't use the Guard. It is possible
- * that the Guard was removed from the samepled set after the circuit
+ * that the Guard was removed from the sampled set after the circuit
* was created so avoid using it. */
if (!entry_guard_could_succeed(circ->guard_state)) {
goto next;
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 7c2159ce8..8d9230b66 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -3452,10 +3452,16 @@ entry_guards_update_state(or_state_t *state)
entry_guards_dirty = 0;
}
-/** Return true iff the circuit's guard can succeed that is can be used. */
+/** Return true iff the circuit's guard can succeed, that is, can be used. */
int
entry_guard_could_succeed(const circuit_guard_state_t *guard_state)
{
+ if (get_options()->UseEntryGuards == 0) {
+/* we're fine with this circuit's first hop, because we're not
+ * configured to use entry guards. */
+return 1;
+ }
+
if (!guard_state) {
return 0;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.4'
commit 90c313e87c67e58476a52533edede3dcde4d4028 Merge: 8f2571b23 0d5152fc5 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.4' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 0d5152fc532a6a6738023d01b9a5b89db6ac7757 Merge: bb5745d65 5a38c73f7 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 0d5152fc532a6a6738023d01b9a5b89db6ac7757 Merge: bb5745d65 5a38c73f7 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
commit ed85f00419f8a6a29826a416d0d787ca09ff17c0 Merge: 762c8b63c 0d5152fc5 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'tor-github/pr/1887' into maint-0.4.3
commit 5a38c73f7098e5c7e24198ef71dce140d421efcf Merge: fb46d1bb3 2913dbd6d Author: Alexander Færøy Date: Tue Jun 30 14:19:28 2020 + Merge branch 'tor-github/pr/1887' into maint-0.4.3 changes/bug34130 | 4 src/lib/sandbox/sandbox.c | 14 ++ 2 files changed, 18 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'tor-github/pr/1887' into maint-0.4.3
commit 5a38c73f7098e5c7e24198ef71dce140d421efcf Merge: fb46d1bb3 2913dbd6d Author: Alexander Færøy Date: Tue Jun 30 14:19:28 2020 + Merge branch 'tor-github/pr/1887' into maint-0.4.3 changes/bug34130 | 4 src/lib/sandbox/sandbox.c | 14 ++ 2 files changed, 18 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
commit ff4bd6699887ea41c1397ec73fb0f9aea519ec76 Merge: 0a3093533 5a38c73f7 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug34130 | 4 src/lib/sandbox/sandbox.c | 14 ++ 2 files changed, 18 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 0d5152fc532a6a6738023d01b9a5b89db6ac7757 Merge: bb5745d65 5a38c73f7 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Fix crash when tor is compiled with NSS and seccomp sandbox is enabled
commit 2913dbd6d9c1ee53c5a7524dd6693f5a6c6f8293
Author: Daniel Pinto
Date: Wed May 6 22:00:50 2020 +0100
Fix crash when tor is compiled with NSS and seccomp sandbox is enabled
Adds seccomp rules for socket and getpeername used by NSS
---
changes/bug34130 | 4
src/lib/sandbox/sandbox.c | 14 ++
2 files changed, 18 insertions(+)
diff --git a/changes/bug34130 b/changes/bug34130
new file mode 100644
index 0..b1e5715fd
--- /dev/null
+++ b/changes/bug34130
@@ -0,0 +1,4 @@
+ o Minor bugfixes (linux seccomp sandbox nss):
+- Fix startup crash when tor is compiled with --enable-nss and
+ sandbox support is enabled. Fixes bug 34130; bugfix on
+ 0.3.5.1-alpha. Patch by Daniel Pinto.
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index 8f577b066..b701c0016 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -265,6 +265,11 @@ static int filter_nopar_gen[] = {
SCMP_SYS(listen),
SCMP_SYS(connect),
SCMP_SYS(getsockname),
+#ifdef ENABLE_NSS
+#ifdef __NR_getpeername
+SCMP_SYS(getpeername),
+#endif
+#endif
SCMP_SYS(recvmsg),
SCMP_SYS(recvfrom),
SCMP_SYS(sendto),
@@ -647,6 +652,15 @@ sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
}
}
+#ifdef ENABLE_NSS
+ rc = seccomp_rule_add_3(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socket),
+SCMP_CMP(0, SCMP_CMP_EQ, PF_INET),
+SCMP_CMP(1, SCMP_CMP_EQ, SOCK_STREAM),
+SCMP_CMP(2, SCMP_CMP_EQ, IPPROTO_IP));
+ if (rc)
+return rc;
+#endif
+
rc = seccomp_rule_add_3(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socket),
SCMP_CMP(0, SCMP_CMP_EQ, PF_UNIX),
SCMP_CMP_MASKED(1, SOCK_CLOEXEC|SOCK_NONBLOCK, SOCK_STREAM),
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.4] Merge branch 'tor-github/pr/1887' into maint-0.4.3
commit 5a38c73f7098e5c7e24198ef71dce140d421efcf Merge: fb46d1bb3 2913dbd6d Author: Alexander Færøy Date: Tue Jun 30 14:19:28 2020 + Merge branch 'tor-github/pr/1887' into maint-0.4.3 changes/bug34130 | 4 src/lib/sandbox/sandbox.c | 14 ++ 2 files changed, 18 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.3] Fix crash when tor is compiled with NSS and seccomp sandbox is enabled
commit 2913dbd6d9c1ee53c5a7524dd6693f5a6c6f8293
Author: Daniel Pinto
Date: Wed May 6 22:00:50 2020 +0100
Fix crash when tor is compiled with NSS and seccomp sandbox is enabled
Adds seccomp rules for socket and getpeername used by NSS
---
changes/bug34130 | 4
src/lib/sandbox/sandbox.c | 14 ++
2 files changed, 18 insertions(+)
diff --git a/changes/bug34130 b/changes/bug34130
new file mode 100644
index 0..b1e5715fd
--- /dev/null
+++ b/changes/bug34130
@@ -0,0 +1,4 @@
+ o Minor bugfixes (linux seccomp sandbox nss):
+- Fix startup crash when tor is compiled with --enable-nss and
+ sandbox support is enabled. Fixes bug 34130; bugfix on
+ 0.3.5.1-alpha. Patch by Daniel Pinto.
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index 8f577b066..b701c0016 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -265,6 +265,11 @@ static int filter_nopar_gen[] = {
SCMP_SYS(listen),
SCMP_SYS(connect),
SCMP_SYS(getsockname),
+#ifdef ENABLE_NSS
+#ifdef __NR_getpeername
+SCMP_SYS(getpeername),
+#endif
+#endif
SCMP_SYS(recvmsg),
SCMP_SYS(recvfrom),
SCMP_SYS(sendto),
@@ -647,6 +652,15 @@ sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
}
}
+#ifdef ENABLE_NSS
+ rc = seccomp_rule_add_3(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socket),
+SCMP_CMP(0, SCMP_CMP_EQ, PF_INET),
+SCMP_CMP(1, SCMP_CMP_EQ, SOCK_STREAM),
+SCMP_CMP(2, SCMP_CMP_EQ, IPPROTO_IP));
+ if (rc)
+return rc;
+#endif
+
rc = seccomp_rule_add_3(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socket),
SCMP_CMP(0, SCMP_CMP_EQ, PF_UNIX),
SCMP_CMP_MASKED(1, SOCK_CLOEXEC|SOCK_NONBLOCK, SOCK_STREAM),
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.3] Merge branch 'tor-github/pr/1887' into maint-0.4.3
commit 5a38c73f7098e5c7e24198ef71dce140d421efcf Merge: fb46d1bb3 2913dbd6d Author: Alexander Færøy Date: Tue Jun 30 14:19:28 2020 + Merge branch 'tor-github/pr/1887' into maint-0.4.3 changes/bug34130 | 4 src/lib/sandbox/sandbox.c | 14 ++ 2 files changed, 18 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'tor-github/pr/1887' into maint-0.4.3
commit 5a38c73f7098e5c7e24198ef71dce140d421efcf Merge: fb46d1bb3 2913dbd6d Author: Alexander Færøy Date: Tue Jun 30 14:19:28 2020 + Merge branch 'tor-github/pr/1887' into maint-0.4.3 changes/bug34130 | 4 src/lib/sandbox/sandbox.c | 14 ++ 2 files changed, 18 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
commit 762c8b63cecde03a461d54774a5346dfa7a338cd Merge: 320205ec5 bb5745d65 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'tor-github/pr/1806' into maint-0.4.2
commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy Date: Tue Jun 30 14:15:57 2020 + Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
commit bb5745d6568ffcaebbe0c69d8e6865ba5eb163ca Merge: 572cf774b fb46d1bb3 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit fb46d1bb3488a6deedc7172a58554e0953c7df87 Merge: 38f3cf410 881f50a9a Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
commit bb5745d6568ffcaebbe0c69d8e6865ba5eb163ca Merge: 572cf774b fb46d1bb3 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
commit fb46d1bb3488a6deedc7172a58554e0953c7df87 Merge: 38f3cf410 881f50a9a Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.3] Merge branch 'tor-github/pr/1806' into maint-0.4.2
commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy Date: Tue Jun 30 14:15:57 2020 + Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'tor-github/pr/1806' into maint-0.4.2
commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy Date: Tue Jun 30 14:15:57 2020 + Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.4] Merge branch 'tor-github/pr/1806' into maint-0.4.2
commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy Date: Tue Jun 30 14:15:57 2020 + Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
commit fb46d1bb3488a6deedc7172a58554e0953c7df87 Merge: 38f3cf410 881f50a9a Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.4'
commit 8f2571b2339cb1633ff5d84e45d4253195c331c3 Merge: 5e1c0c7db bb5745d65 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.4' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] Merge branch 'tor-github/pr/1806' into maint-0.4.2
commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy Date: Tue Jun 30 14:15:57 2020 + Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] sendme: Emit version 1 by default
commit ee3e987898a1e656950aabf8bf0a99aed1450a98 Author: David Goulet Date: Tue Mar 17 10:14:57 2020 -0400 sendme: Emit version 1 by default Closes #33623 Signed-off-by: David Goulet --- changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket33623 b/changes/ticket33623 new file mode 100644 index 0..528af3ca0 --- /dev/null +++ b/changes/ticket33623 @@ -0,0 +1,2 @@ + o Minor feature (sendme, flow control): +- Default on sending SENDME version 1 cells. Closes ticket 33623. diff --git a/src/core/or/sendme.h b/src/core/or/sendme.h index 20477103f..9d757ee43 100644 --- a/src/core/or/sendme.h +++ b/src/core/or/sendme.h @@ -48,7 +48,7 @@ void sendme_record_sending_cell_digest(circuit_t *circ, crypt_path_t *cpath); #define SENDME_MAX_SUPPORTED_VERSION 1 /* The cell version constants for when emitting a cell. */ -#define SENDME_EMIT_MIN_VERSION_DEFAULT 0 +#define SENDME_EMIT_MIN_VERSION_DEFAULT 1 #define SENDME_EMIT_MIN_VERSION_MIN 0 #define SENDME_EMIT_MIN_VERSION_MAX UINT8_MAX ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
commit 0a3093533357d800389bf2d610bce3d3603ed544 Merge: 0c714b2c5 fb46d1bb3 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'tor-github/pr/1806' into maint-0.4.2
commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy Date: Tue Jun 30 14:15:57 2020 + Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] sendme: Emit version 1 by default
commit ee3e987898a1e656950aabf8bf0a99aed1450a98 Author: David Goulet Date: Tue Mar 17 10:14:57 2020 -0400 sendme: Emit version 1 by default Closes #33623 Signed-off-by: David Goulet --- changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket33623 b/changes/ticket33623 new file mode 100644 index 0..528af3ca0 --- /dev/null +++ b/changes/ticket33623 @@ -0,0 +1,2 @@ + o Minor feature (sendme, flow control): +- Default on sending SENDME version 1 cells. Closes ticket 33623. diff --git a/src/core/or/sendme.h b/src/core/or/sendme.h index 20477103f..9d757ee43 100644 --- a/src/core/or/sendme.h +++ b/src/core/or/sendme.h @@ -48,7 +48,7 @@ void sendme_record_sending_cell_digest(circuit_t *circ, crypt_path_t *cpath); #define SENDME_MAX_SUPPORTED_VERSION 1 /* The cell version constants for when emitting a cell. */ -#define SENDME_EMIT_MIN_VERSION_DEFAULT 0 +#define SENDME_EMIT_MIN_VERSION_DEFAULT 1 #define SENDME_EMIT_MIN_VERSION_MIN 0 #define SENDME_EMIT_MIN_VERSION_MAX UINT8_MAX ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit fb46d1bb3488a6deedc7172a58554e0953c7df87 Merge: 38f3cf410 881f50a9a Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'tor-github/pr/1806' into maint-0.4.2
commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy Date: Tue Jun 30 14:15:57 2020 + Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
commit 511e1cfde4152b3ad40cbc4ec6880f9035c5a3b9 Merge: 1b106cded 881f50a9a Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit bb5745d6568ffcaebbe0c69d8e6865ba5eb163ca Merge: 572cf774b fb46d1bb3 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
commit fb46d1bb3488a6deedc7172a58554e0953c7df87 Merge: 38f3cf410 881f50a9a Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'tor-github/pr/1793' into maint-0.3.5
commit 8444fbe904141d7954efe221b663efee1774df41 Merge: c3ad2a1d2 8dc7ad127 Author: Alexander Færøy Date: Tue Jun 30 13:55:39 2020 + Merge branch 'tor-github/pr/1793' into maint-0.3.5 changes/ticket33361 | 3 +++ src/app/config/config.c | 13 + src/test/test_options.c | 19 --- 3 files changed, 24 insertions(+), 11 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] config: Warn if ContactInfo is not set
commit b755a489bdcdf56429c2c7e4fd313b2594dc68c0
Author: David Goulet
Date: Tue Feb 18 09:43:13 2020 -0500
config: Warn if ContactInfo is not set
Closes #33361
Signed-off-by: David Goulet
---
changes/ticket33361 | 3 +++
src/app/config/config.c | 13 +
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/changes/ticket33361 b/changes/ticket33361
new file mode 100644
index 0..bc9715d6a
--- /dev/null
+++ b/changes/ticket33361
@@ -0,0 +1,3 @@
+ o Minor bugfix (relay, configuration):
+- Now warn if the ContactInfo field is not set and mention that the relay
+ might get rejected if so. Fixes bug 33361; bugfix on 0.1.1.10-alpha.
diff --git a/src/app/config/config.c b/src/app/config/config.c
index cbca7d389..1d61b7631 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -3433,10 +3433,15 @@ options_validate(or_options_t *old_options,
or_options_t *options,
}
}
- if (server_mode(options) && !options->ContactInfo)
-log_notice(LD_CONFIG, "Your ContactInfo config option is not set. "
-"Please consider setting it, so we can contact you if your server is "
-"misconfigured or something else goes wrong.");
+ if (server_mode(options) && !options->ContactInfo) {
+log_warn(LD_CONFIG,
+ "Your ContactInfo config option is not set. Please strongly "
+ "consider setting it, so we can contact you if your relay is "
+ "misconfigured, end-of-life, or something else goes wrong. "
+ "It is also possible that your relay might get rejected from "
+ "the network due to a missing valid contact address.");
+ }
+
const char *ContactInfo = options->ContactInfo;
if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo)))
REJECT("ContactInfo config option must be UTF-8.");
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
commit c9c4a3d0f60580b7deeadc59a845e272ab8aa949 Merge: 483082b57 8444fbe90 Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.3.5' into maint-0.4.2 changes/ticket33361 | 3 +++ src/app/config/config.c | 13 + src/test/test_options.c | 19 --- 3 files changed, 24 insertions(+), 11 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] config: Warn if ContactInfo is not set
commit b755a489bdcdf56429c2c7e4fd313b2594dc68c0
Author: David Goulet
Date: Tue Feb 18 09:43:13 2020 -0500
config: Warn if ContactInfo is not set
Closes #33361
Signed-off-by: David Goulet
---
changes/ticket33361 | 3 +++
src/app/config/config.c | 13 +
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/changes/ticket33361 b/changes/ticket33361
new file mode 100644
index 0..bc9715d6a
--- /dev/null
+++ b/changes/ticket33361
@@ -0,0 +1,3 @@
+ o Minor bugfix (relay, configuration):
+- Now warn if the ContactInfo field is not set and mention that the relay
+ might get rejected if so. Fixes bug 33361; bugfix on 0.1.1.10-alpha.
diff --git a/src/app/config/config.c b/src/app/config/config.c
index cbca7d389..1d61b7631 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -3433,10 +3433,15 @@ options_validate(or_options_t *old_options,
or_options_t *options,
}
}
- if (server_mode(options) && !options->ContactInfo)
-log_notice(LD_CONFIG, "Your ContactInfo config option is not set. "
-"Please consider setting it, so we can contact you if your server is "
-"misconfigured or something else goes wrong.");
+ if (server_mode(options) && !options->ContactInfo) {
+log_warn(LD_CONFIG,
+ "Your ContactInfo config option is not set. Please strongly "
+ "consider setting it, so we can contact you if your relay is "
+ "misconfigured, end-of-life, or something else goes wrong. "
+ "It is also possible that your relay might get rejected from "
+ "the network due to a missing valid contact address.");
+ }
+
const char *ContactInfo = options->ContactInfo;
if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo)))
REJECT("ContactInfo config option must be UTF-8.");
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
commit 320205ec5477ee3d08d107832355e27ff5fc9d9d Merge: 91803c3d5 572cf774b Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 572cf774b974edc83631e8f59dfe18e39f093571 Merge: aced9be22 38f3cf410 Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 38f3cf4103cc87d6de711e5495bdac01bbe47879 Merge: 2042ebe88 c9c4a3d0f Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 38f3cf4103cc87d6de711e5495bdac01bbe47879 Merge: 2042ebe88 c9c4a3d0f Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 38f3cf4103cc87d6de711e5495bdac01bbe47879 Merge: 2042ebe88 c9c4a3d0f Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2
commit c9c4a3d0f60580b7deeadc59a845e272ab8aa949 Merge: 483082b57 8444fbe90 Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.3.5' into maint-0.4.2 changes/ticket33361 | 3 +++ src/app/config/config.c | 13 + src/test/test_options.c | 19 --- 3 files changed, 24 insertions(+), 11 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
commit 1b106cdedf525546626124449ba90266edb2f2ee Merge: 19d9d0ee5 c9c4a3d0f Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket33361 | 3 +++ src/app/config/config.c | 13 + src/test/test_options.c | 19 --- 3 files changed, 24 insertions(+), 11 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.4] Merge branch 'tor-github/pr/1793' into maint-0.3.5
commit 8444fbe904141d7954efe221b663efee1774df41 Merge: c3ad2a1d2 8dc7ad127 Author: Alexander Færøy Date: Tue Jun 30 13:55:39 2020 + Merge branch 'tor-github/pr/1793' into maint-0.3.5 changes/ticket33361 | 3 +++ src/app/config/config.c | 13 + src/test/test_options.c | 19 --- 3 files changed, 24 insertions(+), 11 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Fix unit tests that look at contactinfo logs.
commit 8dc7ad1275a53cfe490128e7fb25b759dd7d88b5 Author: Nick Mathewson Date: Thu Mar 12 13:42:17 2020 -0400 Fix unit tests that look at contactinfo logs. --- src/test/test_options.c | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 66b0e7ef1..0e52967a2 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -485,7 +485,8 @@ test_options_validate__uname_for_server(void *ignored) #endif options_test_data_t *tdata = get_options_test_data( - "ORPort 127.0.0.1:"); + "ORPort 127.0.0.1:\n" + "ContactInfo nob...@example.com"); setup_capture_of_logs(LOG_WARN); MOCK(get_uname, fixed_get_uname); @@ -633,9 +634,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, ); tt_int_op(ret, OP_EQ, -1); expect_log_msg( -"Your ContactInfo config option is not" -" set. Please consider setting it, so we can contact you if your" -" server is misconfigured or something else goes wrong.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); free_options_test_data(tdata); @@ -645,9 +648,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, ); tt_int_op(ret, OP_EQ, -1); expect_no_log_msg( -"Your ContactInfo config option is not" -" set. Please consider setting it, so we can contact you if your" -" server is misconfigured or something else goes wrong.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); done: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'tor-github/pr/1793' into maint-0.3.5
commit 8444fbe904141d7954efe221b663efee1774df41 Merge: c3ad2a1d2 8dc7ad127 Author: Alexander Færøy Date: Tue Jun 30 13:55:39 2020 + Merge branch 'tor-github/pr/1793' into maint-0.3.5 changes/ticket33361 | 3 +++ src/app/config/config.c | 13 + src/test/test_options.c | 19 --- 3 files changed, 24 insertions(+), 11 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.4'
commit 5e1c0c7dbba994a1317b01b9906a0a30c197541d Merge: be7386a65 572cf774b Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.4' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
