- tor-commits - lists.torproject.org

[donate-static/staging] Update the opengraph description, title, and metacard
by kez＠torproject.org 20 Oct '21

20 Oct '21

commit 628c328b807bb973d6f7cfaa311755ba2bfb55a0 Author: kez <kez(a)torproject.org> Date: Thu Oct 14 10:16:46 2021 -0700 Update the opengraph description, title, and metacard --- assets/static/images/donate/yec-metacard.png | Bin 0 -> 44583 bytes templates/meta.html | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/static/images/donate/yec-metacard.png b/assets/static/images/donate/yec-metacard.png new file mode 100644 index 00000000..a97389f9 Binary files /dev/null and b/assets/static/images/donate/yec-metacard.png differ diff --git a/templates/meta.html b/templates/meta.html index 321462e9..efa94994 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -3,15 +3,15 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> + <meta name="description" content="{{ _('Stand up for the right to privacy. Donate to the Tor Project') }} | {{ this.title }}"> <meta name="twitter:card" content="summary_large_image"/> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" /> - <meta name="twitter:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png"/> + <meta name="twitter:image" content="{{ '/static/images/donate/yec-metacard.png'|url(absolute=True) }}"/> <meta property="og:url" content="https://donate.torproject.org/" /> - <meta property="og:title" content="{{ _('Use a mask, Use Tor') }}" /> - <meta property="og:description" content="{{ _('Resist the surveillance pandemic. Donate to the Tor Project.') }}" /> - <meta property="og:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png" /> + <meta property="og:title" content="{{ _('Privacy is a Human Right') }}" /> + <meta property="og:description" content="{{ _('Stand up for the right to privacy. Donate to the Tor Project') }}" /> + <meta property="og:image" content="{{ '/static/images/donate/yec-metacard.png'|url(absolute=True) }}" /> <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet">

1 0

[translation/fenix-torbrowserstringsxml_completed] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed
by translation＠torproject.org 20 Oct '21

20 Oct '21

commit 2ac5df6deba5a61b9b7d412a5ee70767921cdad8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 20 16:15:20 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- tr/torbrowser_strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tr/torbrowser_strings.xml b/tr/torbrowser_strings.xml index c417859a1b..79bd623ba7 100644 --- a/tr/torbrowser_strings.xml +++ b/tr/torbrowser_strings.xml @@ -73,4 +73,7 @@  <string name="tor_spoof_english">Gelişmiş gizlilik için web sayfalarının İngilizce sürümlerini açın</string> - </resources> + <string name="tor_useamask_usetor">Maske kullanın, Tor kullanın.</string> + <string name="tor_resistsurveillance">İzleme salgınından korunun.</string> + <string name="tor_donationmatch">Friends of Tor, bağışınız kadar katkıda bulunacak.</string> +</resources>

1 0

[tor/main] relay: For metrics, don't report DNS errors by query type
by dgoulet＠torproject.org 20 Oct '21

20 Oct '21

commit e7abab878241592e262bad1bd64a14b10cc392a4 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 20 10:40:56 2021 -0400 relay: For metrics, don't report DNS errors by query type This is due to the libevent bug https://github.com/libevent/libevent/issues/1219 that fails to return back the DNS record type on error. And so, the MetricsPort now only reports the errors as a global counter and not a per record type. Closes #40490 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40490 | 5 +++++ src/feature/relay/relay_metrics.c | 14 ++++++++++++-- src/feature/stats/rephist.c | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/changes/ticket40490 b/changes/ticket40490 new file mode 100644 index 0000000000..6e9ef50b42 --- /dev/null +++ b/changes/ticket40490 @@ -0,0 +1,5 @@ + o Major bugfix (relay, metrics): + - On the MetricsPort, the DNS error statistics are not reported by record + type ("record=...") anymore due to a libevent bug + (https://github.com/libevent/libevent/issues/1219) Fixes bug 40490; + bugfix on 0.4.7.1-alpha. diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c index 07f89fc043..82abeeeee5 100644 --- a/src/feature/relay/relay_metrics.c +++ b/src/feature/relay/relay_metrics.c @@ -166,21 +166,24 @@ fill_dns_error_values(void) static const size_t num_errors = ARRAY_LENGTH(errors); for (size_t i = 0; i < num_dns_types; i++) { + /* NOTE: Disable the record type label until libevent is fixed. */ +#if 0 /* Dup the label because metrics_format_label() returns a pointer to a * string on the stack and we need that label for all metrics. */ char *record_label = tor_strdup(metrics_format_label("record", dns_types[i].name)); +#endif for (size_t j = 0; j < num_errors; j++) { sentry = metrics_store_add(the_store, rentry->type, rentry->name, rentry->help); - metrics_store_entry_add_label(sentry, record_label); + //metrics_store_entry_add_label(sentry, record_label); metrics_store_entry_add_label(sentry, metrics_format_label("reason", errors[j].name)); metrics_store_entry_update(sentry, rep_hist_get_n_dns_error(dns_types[i].type, errors[j].key)); } - tor_free(record_label); + //tor_free(record_label); } } @@ -192,6 +195,8 @@ fill_dns_query_values(void) const relay_metrics_entry_t *rentry = &base_metrics[RELAY_METRICS_NUM_DNS]; + /* NOTE: Disable the record type label until libevent is fixed (#40490). */ +#if 0 for (size_t i = 0; i < num_dns_types; i++) { /* Dup the label because metrics_format_label() returns a pointer to a * string on the stack and we need that label for all metrics. */ @@ -204,6 +209,11 @@ fill_dns_query_values(void) rep_hist_get_n_dns_request(dns_types[i].type)); tor_free(record_label); } +#endif + + sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_update(sentry, rep_hist_get_n_dns_request(0)); } /** Fill function for the RELAY_METRICS_NUM_GLOBAL_RW_LIMIT metrics. */ diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index aef12e5628..b4431f5a76 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -296,12 +296,29 @@ typedef struct { uint64_t stats_n_request; } dns_stats_t; +/* This is disabled because of the libevent bug where on error we don't get the + * DNS query type back. Once it is fixed, we can re-enable this. */ +#if 0 /** DNS statistics store for each DNS record type for which tor supports only * three at the moment: A, PTR and AAAA. */ static dns_stats_t dns_A_stats; static dns_stats_t dns_PTR_stats; static dns_stats_t dns_AAAA_stats; +#endif + +/** DNS query statistics store. It covers all type of queries. */ +static dns_stats_t dns_all_stats; + +/** Return the point to the DNS statistics store. Ignore the type for now + * because of a libevent problem. */ +static inline dns_stats_t * +get_dns_stats_by_type(const int type) +{ + (void) type; + return &dns_all_stats; +} +#if 0 /** From a libevent record type, return a pointer to the corresponding DNS * statistics store. NULL is returned if the type is unhandled. */ static inline dns_stats_t * @@ -318,6 +335,7 @@ get_dns_stats_by_type(const int type) return NULL; } } +#endif /** Assess the DNS timeout errors and if we have enough to trigger a general * overload. */

1 0

[tor/main] relay: Overload state on DNS timeout is now X% over Y secs
by dgoulet＠torproject.org 20 Oct '21

20 Oct '21

commit 7a8108ea87320da3008e65747baa43c1bbcf13c2 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 20 09:59:04 2021 -0400 relay: Overload state on DNS timeout is now X% over Y secs With this commit, we will only report a general overload state if we've seen more than X% of DNS timeout errors over Y seconds. Previous behavior was to report when a single timeout occured which is really too small of a threshold. The value X is a consensus parameters called "overload_dns_timeout_scale_percent" which is a scaled percentage (factor of 1000) so we can represent decimal points for X like 0.5% for instance. Its default is 1000 which ends up being 1%. The value Y is a consensus parameters called "overload_dns_timeout_period_secs" which is the time period for which will gather DNS errors and once over, we assess if that X% has been reached ultimately triggering a general overload signal. Closes #40491 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40491 | 7 ++ src/feature/nodelist/networkstatus.c | 2 + src/feature/stats/rephist.c | 130 ++++++++++++++++++++++++++++++++++- src/feature/stats/rephist.h | 2 + src/test/test_stats.c | 78 +++++++++++++++++++++ 5 files changed, 218 insertions(+), 1 deletion(-) diff --git a/changes/ticket40491 b/changes/ticket40491 new file mode 100644 index 0000000000..01c6c7d748 --- /dev/null +++ b/changes/ticket40491 @@ -0,0 +1,7 @@ + o Major bugfixes (relay, overload state): + - Report the general overload state for DNS timeout errors only if X% of all + DNS queries over Y seconds are errors. Before that, it only took 1 timeout + to report the overload state which was just too low of a threshold. The X + and Y values are 1% and 10 minutes respectively but they are also + controlled by consensus parameters. Fixes bug 40491; bugfix on + 0.4.6.1-alpha. diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 6867d8c98e..d57db4c415 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -105,6 +105,7 @@ #include "feature/dirauth/vote_microdesc_hash_st.h" #include "feature/nodelist/vote_routerstatus_st.h" #include "feature/nodelist/routerstatus_st.h" +#include "feature/stats/rephist.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -1665,6 +1666,7 @@ notify_before_networkstatus_changes(const networkstatus_t *old_c, dos_consensus_has_changed(new_c); relay_consensus_has_changed(new_c); hs_dos_consensus_has_changed(new_c); + rep_hist_consensus_has_changed(new_c); } /* Called after a new consensus has been put in the global state. It is safe diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index cb3ccdc91e..aef12e5628 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -219,6 +219,59 @@ static uint64_t stats_n_tcp_exhaustion = 0; /***** DNS statistics *****/ +/* We use a scale here so we can represent percentages with decimal points by + * scaling the value by this factor and so 0.5% becomes a value of 500. + * Default is 1% and thus min and max range is 0 to 100%. */ +#define OVERLOAD_DNS_TIMEOUT_PERCENT_SCALE 1000.0 +#define OVERLOAD_DNS_TIMEOUT_PERCENT_DEFAULT 1000 +#define OVERLOAD_DNS_TIMEOUT_PERCENT_MIN 0 +#define OVERLOAD_DNS_TIMEOUT_PERCENT_MAX 100000 + +/** Consensus parameter: indicate what fraction of DNS timeout errors over the + * total number of DNS requests must be reached before we trigger a general + * overload signal .*/ +static double overload_dns_timeout_fraction = + OVERLOAD_DNS_TIMEOUT_PERCENT_DEFAULT / + OVERLOAD_DNS_TIMEOUT_PERCENT_SCALE / 100.0; + +/* Number of seconds for the assessment period. Default is 10 minutes (600) and + * the min max range is within a 32bit value. */ +#define OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_DEFAULT (10 * 60) +#define OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_MIN 0 +#define OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_MAX INT32_MAX + +/** Consensus parameter: Period, in seconds, over which we count the number of + * DNS requests and timeout errors. After that period, we assess if we trigger + * an overload or not. */ +static int32_t overload_dns_timeout_period_secs = + OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_DEFAULT; + +/** Overload DNS statistics. The information in this object is used to assess + * if, due to DNS errors, we should emit a general overload signal or not. + * + * NOTE: This structure is _not_ per DNS query type like the statistics below + * because of a libevent bug + * (https://github.com/libevent/libevent/issues/1219) on error, the type is + * not propagated up back to the user and so we need to keep our own stats for + * the overload signal. */ +typedef struct { + /** Total number of DNS request seen at an Exit. They might not all end + * successfully or might even be lost by tor. This counter is incremented + * right before the DNS request is initiated. */ + uint64_t stats_n_request; + + /** Total number of DNS timeout errors. */ + uint64_t stats_n_error_timeout; + + /** When is the next assessment time of the general overload for DNS errors. + * Once this time is reached, all stats are reset and this time is set to the + * next assessment time. */ + time_t next_assessment_time; +} overload_dns_stats_t; + +/** Keep track of the DNS requests for the general overload state. */ +static overload_dns_stats_t overload_dns_stats; + /** Represents the statistics of DNS queries seen if it is an Exit. */ typedef struct { /* Total number of DNS errors found in RFC 1035 (from 0 to 5 code). */ @@ -266,6 +319,60 @@ get_dns_stats_by_type(const int type) } } +/** Assess the DNS timeout errors and if we have enough to trigger a general + * overload. */ +static void +overload_general_dns_assessment(void) +{ + /* Initialize the time. Should be done once. */ + if (overload_dns_stats.next_assessment_time == 0) { + goto reset; + } + + /* Not the time yet. */ + if (overload_dns_stats.next_assessment_time > approx_time()) { + return; + } + + /* Lets see if we can signal a general overload. */ + double fraction = (double) overload_dns_stats.stats_n_error_timeout / + (double) overload_dns_stats.stats_n_request; + if (fraction >= overload_dns_timeout_fraction) { + log_notice(LD_HIST, "General overload -> DNS timeouts (%" PRIu64 ") " + "fraction %.4f%% is above threshold of %.4f%%", + overload_dns_stats.stats_n_error_timeout, + fraction * 100.0, + overload_dns_timeout_fraction * 100.0); + rep_hist_note_overload(OVERLOAD_GENERAL); + } + + reset: + /* Reset counters for the next period. */ + overload_dns_stats.stats_n_error_timeout = 0; + overload_dns_stats.stats_n_request = 0; + overload_dns_stats.next_assessment_time = + approx_time() + overload_dns_timeout_period_secs; +} + +/** Called just before the consensus will be replaced. Update the consensus + * parameters in case they changed. */ +void +rep_hist_consensus_has_changed(const networkstatus_t *ns) +{ + overload_dns_timeout_fraction = + networkstatus_get_param(ns, "overload_dns_timeout_scale_percent", + OVERLOAD_DNS_TIMEOUT_PERCENT_DEFAULT, + OVERLOAD_DNS_TIMEOUT_PERCENT_MIN, + OVERLOAD_DNS_TIMEOUT_PERCENT_MAX) / + OVERLOAD_DNS_TIMEOUT_PERCENT_SCALE / 100.0; + + overload_dns_timeout_period_secs = + networkstatus_get_param(ns, "overload_dns_timeout_period_secs", + OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_DEFAULT, + OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_MIN, + OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_MAX); +} + /** Return the DNS error count for the given libevent DNS type and error code. * The possible types are: DNS_IPv4_A, DNS_PTR, DNS_IPv6_AAAA. */ uint64_t @@ -320,10 +427,31 @@ rep_hist_get_n_dns_request(int type) } /** Note a DNS error for the given given libevent DNS record type and error - * code. Possible types are: DNS_IPv4_A, DNS_PTR, DNS_IPv6_AAAA. */ + * code. Possible types are: DNS_IPv4_A, DNS_PTR, DNS_IPv6_AAAA. + * + * NOTE: Libevent is _not_ returning the type in case of an error and so if + * error is anything but DNS_ERR_NONE, the type is not usable and set to 0. + * + * See: https://gitlab.torproject.org/tpo/core/tor/-/issues/40490 */ void rep_hist_note_dns_error(int type, uint8_t error) { + /* Assess if we need to trigger a general overload with regards to the DNS + * errors or not. */ + overload_general_dns_assessment(); + + /* Because of the libevent problem (see note in the function comment), we + * disregard the DNS query type and keep track of DNS timeout for the + * overload state. */ + if (error == DNS_ERR_TIMEOUT) { + overload_dns_stats.stats_n_error_timeout++; + } + overload_dns_stats.stats_n_request++; + + /* Again, the libevent bug (see function comment), for an error that is + * anything but DNS_ERR_NONE, the type is always 0 which means that we don't + * have a DNS stat object for it so this code will do nothing until libevent + * is fixed. */ dns_stats_t *dns_stats = get_dns_stats_by_type(type); /* Unsupported DNS query type. */ if (!dns_stats) { diff --git a/src/feature/stats/rephist.h b/src/feature/stats/rephist.h index 7f414de4c8..6918ed18c2 100644 --- a/src/feature/stats/rephist.h +++ b/src/feature/stats/rephist.h @@ -89,6 +89,8 @@ uint64_t rep_hist_get_n_dns_request(int type); void rep_hist_note_dns_request(int type); void rep_hist_note_dns_error(int type, uint8_t error); +void rep_hist_consensus_has_changed(const networkstatus_t *ns); + extern uint64_t rephist_total_alloc; extern uint32_t rephist_total_num; #ifdef TOR_UNIT_TESTS diff --git a/src/test/test_stats.c b/src/test/test_stats.c index 081ae22cd5..e85ad40699 100644 --- a/src/test/test_stats.c +++ b/src/test/test_stats.c @@ -51,6 +51,8 @@ #include "feature/stats/bw_array_st.h" #include "feature/relay/router.h" +#include <event2/dns.h> + /** Run unit tests for some stats code. */ static void test_stats(void *arg) @@ -865,6 +867,81 @@ test_overload_stats(void *arg) tor_free(stats_str); } +/** Test the overload stats logic. */ +static void +test_overload_dns_timeout(void *arg) +{ + char *stats_str = NULL; + (void) arg; + + /* Lets simulate a series of timeouts but below our default 1% threshold. */ + + for (int i = 0; i < 1000; i++) { + /* This should trigger 9 timeouts which is just below 1% (10) */ + if (i > 0 && !(i % 100)) { + rep_hist_note_dns_error(0, DNS_ERR_TIMEOUT); + } else { + rep_hist_note_dns_error(0, DNS_ERR_NONE); + } + } + + /* No overload yet. */ + stats_str = rep_hist_get_overload_general_line(); + tt_assert(!stats_str); + + /* Move it 10 minutes in the future and see if we get a general overload. */ + update_approx_time(approx_time() + (10 * 60)); + + /* This query should NOT trigger the general overload because we are below + * our default of 1%. */ + rep_hist_note_dns_error(0, DNS_ERR_NONE); + stats_str = rep_hist_get_overload_general_line(); + tt_assert(!stats_str); + + /* We'll now go above our 1% threshold. */ + for (int i = 0; i < 1000; i++) { + /* This should trigger 10 timeouts which is our threshold of 1% (10) */ + if (!(i % 10)) { + rep_hist_note_dns_error(0, DNS_ERR_TIMEOUT); + } else { + rep_hist_note_dns_error(0, DNS_ERR_NONE); + } + } + + /* Move it 10 minutes in the future and see if we get a general overload. */ + update_approx_time(approx_time() + (10 * 60)); + + /* This query should trigger the general overload because we are above 1%. */ + rep_hist_note_dns_error(0, DNS_ERR_NONE); + stats_str = rep_hist_get_overload_general_line(); + tt_assert(stats_str); + tor_free(stats_str); + + /* Move 72h in the future, we should NOT get an overload anymore. */ + update_approx_time(approx_time() + (72 * 3600)); + + stats_str = rep_hist_get_overload_general_line(); + tt_assert(!stats_str); + + /* This query should NOT trigger the general overload. */ + rep_hist_note_dns_error(0, DNS_ERR_TIMEOUT); + stats_str = rep_hist_get_overload_general_line(); + tt_assert(!stats_str); + + /* Move it 10 minutes in the future and see if we get a general overload. We + * have now 100% of requests timing out. */ + update_approx_time(approx_time() + (10 * 60)); + + /* This query should trigger the general overload with 50% of timeouts. */ + rep_hist_note_dns_error(0, DNS_ERR_NONE); + stats_str = rep_hist_get_overload_general_line(); + tt_assert(stats_str); + tor_free(stats_str); + + done: + tor_free(stats_str); +} + #define ENT(name) \ { #name, test_ ## name , 0, NULL, NULL } #define FORK(name) \ @@ -881,6 +958,7 @@ struct testcase_t stats_tests[] = { FORK(rephist_v3_onions), FORK(load_stats_file), FORK(overload_stats), + FORK(overload_dns_timeout), END_OF_TESTCASES };

1 0

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

20 Oct '21

commit 27e32beadf66aaa92c979a2760b49348209fc62a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 20 14:45:15 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+hu.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+hu.po b/contents+hu.po index 893b93fcbe..e93a125650 100644 --- a/contents+hu.po +++ b/contents+hu.po @@ -9,6 +9,7 @@ # vargaviktor <viktor.varga(a)gmail.com>, 2021 # Emma Peel, 2021 # erinm, 2021 +# Aninus Partikler, 2021 # msgid "" msgstr "" @@ -16,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-11 07:32+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: erinm, 2021\n" +"Last-Translator: Aninus Partikler, 2021\n" "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +37,7 @@ msgstr "Közösségünk az emberi jogok védelmezőiből áll világszerte." #: https//community.torproject.org/outreach/ #: (content/outreach/contents+en.lrpage.section) msgid "community" -msgstr "" +msgstr "közösség" #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "The Tor community is made up of all kinds of contributors."

1 0

[community/master] Adds issue creation templates for bugs, features, proposals and documentation.
by gus＠torproject.org 20 Oct '21

20 Oct '21

commit fbc65456ba9d453eea1e5096c63d0a9c8b82c8dc Author: Gaba <gaba(a)riseup.net> Date: Tue Dec 22 08:45:58 2020 -0300 Adds issue creation templates for bugs, features, proposals and documentation. --- .gitlab/issue_templates/bug.md | 42 ++++++++++++++++++++++++++++++++ .gitlab/issue_templates/documentation.md | 35 ++++++++++++++++++++++++++ .gitlab/issue_templates/feature.md | 15 ++++++++++++ .gitlab/issue_templates/proposal.md | 5 ++++ 4 files changed, 97 insertions(+) diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md new file mode 100644 index 0000000..d27dea5 --- /dev/null +++ b/.gitlab/issue_templates/bug.md @@ -0,0 +1,42 @@ + + +### Summary + + + +### Steps to reproduce: + +1. step 1 +2. step 2 +3. ... + +### What is the current bug behavior? + + + +### What is the expected behavior? + + + +### Environment + + + +- Version: e.g. 0.10, output of --version (without backslashes) +- Operating system: Debian GNU/Linux 9.1 (stretch), Windows 7, Ubuntu Xenial, etc +- Install method: distribution package, from source tarball, from git, etc +- etc... + +### Relevant logs and/or screenshots: + + + +### Possible fixes: + + + +/label ~bug diff --git a/.gitlab/issue_templates/documentation.md b/.gitlab/issue_templates/documentation.md new file mode 100644 index 0000000..6f0d4b4 --- /dev/null +++ b/.gitlab/issue_templates/documentation.md @@ -0,0 +1,35 @@ + + +### Problem to solve + + + +* What feature(s) affected? +* What docs or doc section affected? Include links or paths. +* Is there a problem with a specific document, or a feature/process that's not addressed sufficiently in docs? +* Any other ideas or requests? + + +### Further details + + + +### Proposal + + + +### Who can address the issue + + + +### Other links/references + + + +/label ~documentation diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md new file mode 100644 index 0000000..f0c3f1b --- /dev/null +++ b/.gitlab/issue_templates/feature.md @@ -0,0 +1,15 @@ + + +### Summary + + + +### What is the expected behavior? + + + + + +/label ~Feature diff --git a/.gitlab/issue_templates/proposal.md b/.gitlab/issue_templates/proposal.md new file mode 100644 index 0000000..990ca70 --- /dev/null +++ b/.gitlab/issue_templates/proposal.md @@ -0,0 +1,5 @@ + + +### Proposal + +

1 0

[community/master] Change track url to gitlab one for when adding a new issue.
by gus＠torproject.org 20 Oct '21

20 Oct '21

commit 8987510f230909080c0bacc8c624c727c027f6e0 Author: Gaba <gaba(a)riseup.net> Date: Tue Dec 22 08:48:42 2020 -0300 Change track url to gitlab one for when adding a new issue. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d0d917a..0444a94 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ or browse it [online](http://gitweb.torproject.org/project/web/community.git). ## How to report bugs or feedback -First check if your issue wasn't already opened in [gitlab.torproject.org](https://gitlab.torproject.org/web/community/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. +First check if your issue wasn't already opened in [gitlab.torproject.org](https://gitlab.torproject.org/web/community/issues), then file a [ticket](https://gitlab.torproject.org/tpo/web/community/-/issues/new) and choose the component: Webpages/Community. ## What is Lektor

1 0

[community/master] Fix merge conflicts
by gus＠torproject.org 20 Oct '21

20 Oct '21

commit bdfa8de10c52bc62621053f0617d5ebc79f56764 Merge: 135fe85 8987510 Author: gus <gus(a)torproject.org> Date: Wed Oct 20 10:31:23 2021 -0300 Fix merge conflicts .gitlab/issue_templates/bug.md | 42 ++++++++++++++++++++++++++++++++ .gitlab/issue_templates/documentation.md | 35 ++++++++++++++++++++++++++ .gitlab/issue_templates/feature.md | 15 ++++++++++++ .gitlab/issue_templates/proposal.md | 5 ++++ 4 files changed, 97 insertions(+)

1 0

[community/master] i #233: Update NYTimes onion
by emmapeel＠torproject.org 20 Oct '21

20 Oct '21

commit 135fe85b056d863bb4567b61864c476a7134aaa7 Author: HackerNCoder <hackerncoder(a)encryptionin.space> Date: Sat Oct 16 17:25:39 2021 +0000 i #233: Update NYTimes onion closes: https://gitlab.torproject.org/tpo/web/community/-/issues/233 --- databags/onions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/onions.ini b/databags/onions.ini index 5f1470b..d00380f 100644 --- a/databags/onions.ini +++ b/databags/onions.ini @@ -4,7 +4,7 @@ image = /static/images/onions/png/propublica.png label = ProPublica [nytimes] -link = https://www.nytimes3xbfgragh.onion +link = https://www.nytimesn7cgmftshazwhfgzm37qxb44r64ytbb2dj3x62d2lljsciiyd.onion image = /static/images/onions/png/nytimes.png label = The New York Times

1 0

[tpo/master] Fix #239
by gus＠torproject.org 20 Oct '21

20 Oct '21

commit 775f4cb65208f1a50ed1963f77103ea3c6bf2c2c Author: gus <gus(a)torproject.org> Date: Wed Oct 20 10:22:11 2021 -0300 Fix #239 --- templates/press.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/press.html b/templates/press.html index 2ea49a82..5a07e169 100644 --- a/templates/press.html +++ b/templates/press.html @@ -9,7 +9,7 @@ <a class="h5 text-primary" href="https://support.torproject.org/" title="Tor Project Support Portal" target="_blank">{{ _('Visit our Support Portal') }}</a> </div> <div class="row pl-3 text-tpo"> - <a class="h5 text-primary" href="https://webchat.oftc.net/" title="Tor Project IRC" target="_blank">{{ _('Ask us on #tor') }}</a> + <a class="h5 text-primary" href="https://webchat.oftc.net/?channels=tor" title="Tor Project IRC" target="_blank">{{ _('Ask us on #tor') }}</a> </div> <div class="row pl-3 text-tpo"> <a class="h5 text-primary" href="http://lists.torproject.org/" title="Tor Project Mailing List" target="_blank">{{ _('Write to a mailing list') }}</a>

1 0