[tor-commits] [translation/donatepages-messagespot_completed] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot_completed
commit 718465254188d131925803f50116e4b4c1f051d4 Author: Translation commit bot Date: Tue Nov 12 00:17:40 2019 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot_completed --- messages.pot | 373 --- 1 file changed, 203 insertions(+), 170 deletions(-) diff --git a/messages.pot b/messages.pot index de9ddd09f..53e97ac3c 100644 --- a/messages.pot +++ b/messages.pot @@ -2,29 +2,19 @@ msgid "" msgstr "" -#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:92 +#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:101 +msgid "Tracking, surveillance, and censorship are widespread online." +msgstr "Tracking, surveillance, and censorship are widespread online." + +#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:105 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:66 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:511 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:656 -msgid "Tor: Strength in Numbers" -msgstr "Tor: Strength in Numbers" - -#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:99 -#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:107 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:663 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:671 -msgid "" -"Stand up for the universal human rights to privacy and freedom and help keep" -" Tor robust and secure." -msgstr "" -"Stand up for the universal human rights to privacy and freedom and help keep" -" Tor robust and secure." +msgid "Take back the internet with Tor" +msgstr "Take back the internet with Tor" -#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:101 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:665 -msgid "Mozilla will match your gift and double your impact." -msgstr "Mozilla will match your gift and double your impact." +#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:112 +msgid "Give today, and Mozilla will match your donation." +msgstr "Give today, and Mozilla will match your donation." #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:47 msgid "" @@ -39,22 +29,22 @@ msgid "Fit" msgstr "Fit" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:58 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:527 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:514 msgid "Select Fit" msgstr "Select Fit" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:62 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:519 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:506 msgid "Slim" msgstr "Slim" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:66 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:515 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:502 msgid "Classic" msgstr "Classic" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:74 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:523 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:510 msgid "European" msgstr "European" @@ -63,7 +53,7 @@ msgid "Size" msgstr "Size" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:88 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:531 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:518 msgid "Select Size" msgstr "Select Size" @@ -89,13 +79,13 @@ msgstr "XXL" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:47 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:70 -msgid "Donate to the Tor Project and protect the privacy of millions." -msgstr "Donate to the Tor Project and protect the privacy of millions." +msgid "Privacy and freedom online should be the default." +msgstr "Privacy and freedom online should be
[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
commit 0cfb7f6ce715d1947029c7dd92e6fd79868dc599 Merge: 111f988b5 9be51e8a8 Author: teor Date: Tue Nov 12 10:09:57 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32295 | 3 ++ src/lib/confmgt/type_defs.c| 39 +++-- src/lib/confmgt/typedvar.c | 11 ++--- src/lib/confmgt/typedvar.h | 2 +- src/lib/confmgt/var_type_def_st.h | 5 ++- src/test/conf_examples/obsolete_1/expected | 0 src/test/conf_examples/obsolete_1/torrc| 68 ++ src/test/conf_examples/obsolete_2/expected | 0 src/test/conf_examples/obsolete_2/torrc| 2 + 9 files changed, 110 insertions(+), 20 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] config: Log the option name when skipping an obsolete option
commit 2ee04fc309b8f4fb3c34271587ab47addaff32ae
Author: teor
Date: Mon Nov 11 11:59:50 2019 +1000
config: Log the option name when skipping an obsolete option
This is a basic fix for 0.4.2 only. The fix for 0.4.3 and later
is in 32404.
Fixes bug 32295; bugfix on 0.4.2.1-alpha.
---
changes/bug32295 | 3 +++
src/lib/confmgt/type_defs.c | 39 ++-
src/lib/confmgt/typedvar.c| 11 ++-
src/lib/confmgt/typedvar.h| 2 +-
src/lib/confmgt/var_type_def_st.h | 5 -
5 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/changes/bug32295 b/changes/bug32295
new file mode 100644
index 0..e5e5a4399
--- /dev/null
+++ b/changes/bug32295
@@ -0,0 +1,3 @@
+ o Minor bugfixes (configuration):
+- Log the option name when skipping an obsolete option.
+ Fixes bug 32295; bugfix on 0.4.2.1-alpha.
diff --git a/src/lib/confmgt/type_defs.c b/src/lib/confmgt/type_defs.c
index ed930fb02..5066e1226 100644
--- a/src/lib/confmgt/type_defs.c
+++ b/src/lib/confmgt/type_defs.c
@@ -52,10 +52,11 @@
static int
string_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
char **p = (char**)target;
*p = tor_strdup(value);
return 0;
@@ -106,8 +107,10 @@ static const int_parse_params_t INT_PARSE_POSINT = {
};
static int
-int_parse(void *target, const char *value, char **errmsg, const void *params)
+int_parse(void *target, const char *value, char **errmsg, const void *params,
+ const char *key)
{
+ (void)key;
const int_parse_params_t *pp;
if (params) {
pp = params;
@@ -169,10 +172,11 @@ static const var_type_fns_t int_fns = {
static int
uint64_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
uint64_t *p = target;
int ok=0;
*p = tor_parse_uint64(value, 10, 0, UINT64_MAX, , NULL);
@@ -219,8 +223,9 @@ static const var_type_fns_t uint64_fns = {
static int
units_parse_u64(void *target, const char *value, char **errmsg,
-const void *params)
+const void *params, const char *key)
{
+ (void)key;
const unit_table_t *table = params;
tor_assert(table);
uint64_t *v = (uint64_t*)target;
@@ -235,8 +240,9 @@ units_parse_u64(void *target, const char *value, char
**errmsg,
static int
units_parse_int(void *target, const char *value, char **errmsg,
- const void *params)
+const void *params, const char *key)
{
+ (void)key;
const unit_table_t *table = params;
tor_assert(table);
int *v = (int*)target;
@@ -283,10 +289,11 @@ static const var_type_fns_t interval_fns = {
static int
double_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
double *v = (double*)target;
char *endptr=NULL;
errno = 0;
@@ -347,8 +354,9 @@ typedef struct enumeration_table_t {
static int
enum_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
+ (void)key;
const enumeration_table_t *table = params;
int *p = (int *)target;
for (; table->name; ++table) {
@@ -422,9 +430,10 @@ static const var_type_fns_t enum_fns = {
static int
time_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void) params;
+ (void) key;
time_t *p = target;
if (parse_iso_time(value, p) < 0) {
tor_asprintf(errmsg, "Invalid time %s", escaped(value));
@@ -466,10 +475,11 @@ static const var_type_fns_t time_fns = {
static int
csv_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
smartlist_t **sl = (smartlist_t**)target;
*sl = smartlist_new();
smartlist_split_string(*sl, value, ",",
@@ -515,7 +525,7 @@ static const var_type_fns_t csv_fns = {
static int
legacy_csv_interval_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
/* We used to have entire smartlists here. But now that all of our
@@ -529,7 +539,7 @@ legacy_csv_interval_parse(void *target, const char *value,
char **errmsg,
val = tmp;
}
- int rv = units_parse_int(target, val, errmsg, _units);
+ int rv = units_parse_int(target, val, errmsg, _units, key);
tor_free(tmp);
return rv;
}
@@ -693,14 +703,17 @@ static const var_type_fns_t linelist_s_fns = {
static int
[tor-commits] [tor/master] Merge branch 'maint-0.4.2'
commit 233ccef6d878253ee4f0cfa4610577101b68e6c6 Merge: 3d6ec40e6 9be51e8a8 Author: teor Date: Tue Nov 12 10:10:01 2019 +1000 Merge branch 'maint-0.4.2' src/test/conf_examples/obsolete_1/expected | 0 src/test/conf_examples/obsolete_1/torrc| 68 ++ src/test/conf_examples/obsolete_2/expected | 0 src/test/conf_examples/obsolete_2/torrc| 2 + 4 files changed, 70 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.2] config: Log the option name when skipping an obsolete option
commit 2ee04fc309b8f4fb3c34271587ab47addaff32ae
Author: teor
Date: Mon Nov 11 11:59:50 2019 +1000
config: Log the option name when skipping an obsolete option
This is a basic fix for 0.4.2 only. The fix for 0.4.3 and later
is in 32404.
Fixes bug 32295; bugfix on 0.4.2.1-alpha.
---
changes/bug32295 | 3 +++
src/lib/confmgt/type_defs.c | 39 ++-
src/lib/confmgt/typedvar.c| 11 ++-
src/lib/confmgt/typedvar.h| 2 +-
src/lib/confmgt/var_type_def_st.h | 5 -
5 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/changes/bug32295 b/changes/bug32295
new file mode 100644
index 0..e5e5a4399
--- /dev/null
+++ b/changes/bug32295
@@ -0,0 +1,3 @@
+ o Minor bugfixes (configuration):
+- Log the option name when skipping an obsolete option.
+ Fixes bug 32295; bugfix on 0.4.2.1-alpha.
diff --git a/src/lib/confmgt/type_defs.c b/src/lib/confmgt/type_defs.c
index ed930fb02..5066e1226 100644
--- a/src/lib/confmgt/type_defs.c
+++ b/src/lib/confmgt/type_defs.c
@@ -52,10 +52,11 @@
static int
string_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
char **p = (char**)target;
*p = tor_strdup(value);
return 0;
@@ -106,8 +107,10 @@ static const int_parse_params_t INT_PARSE_POSINT = {
};
static int
-int_parse(void *target, const char *value, char **errmsg, const void *params)
+int_parse(void *target, const char *value, char **errmsg, const void *params,
+ const char *key)
{
+ (void)key;
const int_parse_params_t *pp;
if (params) {
pp = params;
@@ -169,10 +172,11 @@ static const var_type_fns_t int_fns = {
static int
uint64_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
uint64_t *p = target;
int ok=0;
*p = tor_parse_uint64(value, 10, 0, UINT64_MAX, , NULL);
@@ -219,8 +223,9 @@ static const var_type_fns_t uint64_fns = {
static int
units_parse_u64(void *target, const char *value, char **errmsg,
-const void *params)
+const void *params, const char *key)
{
+ (void)key;
const unit_table_t *table = params;
tor_assert(table);
uint64_t *v = (uint64_t*)target;
@@ -235,8 +240,9 @@ units_parse_u64(void *target, const char *value, char
**errmsg,
static int
units_parse_int(void *target, const char *value, char **errmsg,
- const void *params)
+const void *params, const char *key)
{
+ (void)key;
const unit_table_t *table = params;
tor_assert(table);
int *v = (int*)target;
@@ -283,10 +289,11 @@ static const var_type_fns_t interval_fns = {
static int
double_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
double *v = (double*)target;
char *endptr=NULL;
errno = 0;
@@ -347,8 +354,9 @@ typedef struct enumeration_table_t {
static int
enum_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
+ (void)key;
const enumeration_table_t *table = params;
int *p = (int *)target;
for (; table->name; ++table) {
@@ -422,9 +430,10 @@ static const var_type_fns_t enum_fns = {
static int
time_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void) params;
+ (void) key;
time_t *p = target;
if (parse_iso_time(value, p) < 0) {
tor_asprintf(errmsg, "Invalid time %s", escaped(value));
@@ -466,10 +475,11 @@ static const var_type_fns_t time_fns = {
static int
csv_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
smartlist_t **sl = (smartlist_t**)target;
*sl = smartlist_new();
smartlist_split_string(*sl, value, ",",
@@ -515,7 +525,7 @@ static const var_type_fns_t csv_fns = {
static int
legacy_csv_interval_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
/* We used to have entire smartlists here. But now that all of our
@@ -529,7 +539,7 @@ legacy_csv_interval_parse(void *target, const char *value,
char **errmsg,
val = tmp;
}
- int rv = units_parse_int(target, val, errmsg, _units);
+ int rv = units_parse_int(target, val, errmsg, _units, key);
tor_free(tmp);
return rv;
}
@@ -693,14 +703,17 @@ static const var_type_fns_t linelist_s_fns = {
static int
[tor-commits] [tor/master] Merge branch 'maint-0.4.2'
commit 3d6ec40e6a0ad2658a49a1b02bbf93f1a731fe73 Merge: 3d1a7d7dd 2ee04fc30 Author: teor Date: Tue Nov 12 10:07:46 2019 +1000 Merge branch 'maint-0.4.2' "git merge --strategy ours", because: * 32295 is a quick fix for 0.4.2 only * 32404 has a better implementation for master ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] test/parseconf: Add tests for ignored options
commit 9be51e8a8e0663a60359f720664defdb4d1d593a Author: teor Date: Mon Nov 11 12:01:31 2019 +1000 test/parseconf: Add tests for ignored options These tests will also pass on 0.4.3, with the original implementation, and with the new implementation in 32404. Part of 32295 and 32404. --- src/test/conf_examples/obsolete_1/expected | 0 src/test/conf_examples/obsolete_1/torrc| 68 ++ src/test/conf_examples/obsolete_2/expected | 0 src/test/conf_examples/obsolete_2/torrc| 2 + 4 files changed, 70 insertions(+) diff --git a/src/test/conf_examples/obsolete_1/expected b/src/test/conf_examples/obsolete_1/expected new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/obsolete_1/torrc b/src/test/conf_examples/obsolete_1/torrc new file mode 100644 index 0..3cd9a6d77 --- /dev/null +++ b/src/test/conf_examples/obsolete_1/torrc @@ -0,0 +1,68 @@ +# These options are obsolete as of 0.4.2 +AllowDotExit +AllowInvalidNodes +AllowSingleHopCircuits +AllowSingleHopExits +AlternateHSAuthority +AuthDirBadDir +AuthDirBadDirCCs +AuthDirRejectUnlisted +AuthDirListBadDirs +AuthDirMaxServersPerAuthAddr +CircuitIdleTimeout +ControlListenAddress +DirListenAddress +DisableIOCP +DisableV2DirectoryInfo_ +DynamicDHGroups +DNSListenAddress +TestingEnableTbEmptyEvent +ExcludeSingleHopRelays +FallbackNetworkstatusFile +FastFirstHopPK +FetchV2Networkstatus +Group +HidServDirectoryV2 +CloseHSClientCircuitsImmediatelyOnTimeout +CloseHSServiceRendCircuitsImmediatelyOnTimeout +MaxOnionsPending +NamingAuthoritativeDirectory +NATDListenAddress +PredictedPortsRelevanceTime +WarnUnsafeSocks +ORListenAddress +PathBiasDisableRate +PathBiasScaleFactor +PathBiasMultFactor +PathBiasUseCloseCounts +PortForwarding +PortForwardingHelper +PreferTunneledDirConns +RecommendedPackages +RunTesting +SchedulerLowWaterMark__ +SchedulerHighWaterMark__ +SchedulerMaxFlushCells__ +SocksListenAddress +StrictEntryNodes +StrictExitNodes +Support022HiddenServices +Tor2webMode +Tor2webRendezvousPoints +TLSECGroup +TransListenAddress +TunnelDirConns +UseEntryGuardsAsDirGuards +UseNTorHandshake +UserspaceIOCPBuffers +V1AuthoritativeDirectory +V2AuthoritativeDirectory +VoteOnHidServDirectoriesV2 +UseFilteringSSLBufferevents +__UseFilteringSSLBufferevents +TestingConsensusMaxDownloadTries +ClientBootstrapConsensusMaxDownloadTries +ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries +TestingDescriptorMaxDownloadTries +TestingMicrodescMaxDownloadTries +TestingCertMaxDownloadTries diff --git a/src/test/conf_examples/obsolete_2/expected b/src/test/conf_examples/obsolete_2/expected new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/obsolete_2/torrc b/src/test/conf_examples/obsolete_2/torrc new file mode 100644 index 0..4f78d4762 --- /dev/null +++ b/src/test/conf_examples/obsolete_2/torrc @@ -0,0 +1,2 @@ +# This option has been obsolete for some time +AllowDotExit ___ 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] test/parseconf: Add tests for ignored options
commit 9be51e8a8e0663a60359f720664defdb4d1d593a Author: teor Date: Mon Nov 11 12:01:31 2019 +1000 test/parseconf: Add tests for ignored options These tests will also pass on 0.4.3, with the original implementation, and with the new implementation in 32404. Part of 32295 and 32404. --- src/test/conf_examples/obsolete_1/expected | 0 src/test/conf_examples/obsolete_1/torrc| 68 ++ src/test/conf_examples/obsolete_2/expected | 0 src/test/conf_examples/obsolete_2/torrc| 2 + 4 files changed, 70 insertions(+) diff --git a/src/test/conf_examples/obsolete_1/expected b/src/test/conf_examples/obsolete_1/expected new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/obsolete_1/torrc b/src/test/conf_examples/obsolete_1/torrc new file mode 100644 index 0..3cd9a6d77 --- /dev/null +++ b/src/test/conf_examples/obsolete_1/torrc @@ -0,0 +1,68 @@ +# These options are obsolete as of 0.4.2 +AllowDotExit +AllowInvalidNodes +AllowSingleHopCircuits +AllowSingleHopExits +AlternateHSAuthority +AuthDirBadDir +AuthDirBadDirCCs +AuthDirRejectUnlisted +AuthDirListBadDirs +AuthDirMaxServersPerAuthAddr +CircuitIdleTimeout +ControlListenAddress +DirListenAddress +DisableIOCP +DisableV2DirectoryInfo_ +DynamicDHGroups +DNSListenAddress +TestingEnableTbEmptyEvent +ExcludeSingleHopRelays +FallbackNetworkstatusFile +FastFirstHopPK +FetchV2Networkstatus +Group +HidServDirectoryV2 +CloseHSClientCircuitsImmediatelyOnTimeout +CloseHSServiceRendCircuitsImmediatelyOnTimeout +MaxOnionsPending +NamingAuthoritativeDirectory +NATDListenAddress +PredictedPortsRelevanceTime +WarnUnsafeSocks +ORListenAddress +PathBiasDisableRate +PathBiasScaleFactor +PathBiasMultFactor +PathBiasUseCloseCounts +PortForwarding +PortForwardingHelper +PreferTunneledDirConns +RecommendedPackages +RunTesting +SchedulerLowWaterMark__ +SchedulerHighWaterMark__ +SchedulerMaxFlushCells__ +SocksListenAddress +StrictEntryNodes +StrictExitNodes +Support022HiddenServices +Tor2webMode +Tor2webRendezvousPoints +TLSECGroup +TransListenAddress +TunnelDirConns +UseEntryGuardsAsDirGuards +UseNTorHandshake +UserspaceIOCPBuffers +V1AuthoritativeDirectory +V2AuthoritativeDirectory +VoteOnHidServDirectoriesV2 +UseFilteringSSLBufferevents +__UseFilteringSSLBufferevents +TestingConsensusMaxDownloadTries +ClientBootstrapConsensusMaxDownloadTries +ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries +TestingDescriptorMaxDownloadTries +TestingMicrodescMaxDownloadTries +TestingCertMaxDownloadTries diff --git a/src/test/conf_examples/obsolete_2/expected b/src/test/conf_examples/obsolete_2/expected new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/obsolete_2/torrc b/src/test/conf_examples/obsolete_2/torrc new file mode 100644 index 0..4f78d4762 --- /dev/null +++ b/src/test/conf_examples/obsolete_2/torrc @@ -0,0 +1,2 @@ +# This option has been obsolete for some time +AllowDotExit ___ 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] config: Log the option name when skipping an obsolete option
commit 2ee04fc309b8f4fb3c34271587ab47addaff32ae
Author: teor
Date: Mon Nov 11 11:59:50 2019 +1000
config: Log the option name when skipping an obsolete option
This is a basic fix for 0.4.2 only. The fix for 0.4.3 and later
is in 32404.
Fixes bug 32295; bugfix on 0.4.2.1-alpha.
---
changes/bug32295 | 3 +++
src/lib/confmgt/type_defs.c | 39 ++-
src/lib/confmgt/typedvar.c| 11 ++-
src/lib/confmgt/typedvar.h| 2 +-
src/lib/confmgt/var_type_def_st.h | 5 -
5 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/changes/bug32295 b/changes/bug32295
new file mode 100644
index 0..e5e5a4399
--- /dev/null
+++ b/changes/bug32295
@@ -0,0 +1,3 @@
+ o Minor bugfixes (configuration):
+- Log the option name when skipping an obsolete option.
+ Fixes bug 32295; bugfix on 0.4.2.1-alpha.
diff --git a/src/lib/confmgt/type_defs.c b/src/lib/confmgt/type_defs.c
index ed930fb02..5066e1226 100644
--- a/src/lib/confmgt/type_defs.c
+++ b/src/lib/confmgt/type_defs.c
@@ -52,10 +52,11 @@
static int
string_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
char **p = (char**)target;
*p = tor_strdup(value);
return 0;
@@ -106,8 +107,10 @@ static const int_parse_params_t INT_PARSE_POSINT = {
};
static int
-int_parse(void *target, const char *value, char **errmsg, const void *params)
+int_parse(void *target, const char *value, char **errmsg, const void *params,
+ const char *key)
{
+ (void)key;
const int_parse_params_t *pp;
if (params) {
pp = params;
@@ -169,10 +172,11 @@ static const var_type_fns_t int_fns = {
static int
uint64_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
uint64_t *p = target;
int ok=0;
*p = tor_parse_uint64(value, 10, 0, UINT64_MAX, , NULL);
@@ -219,8 +223,9 @@ static const var_type_fns_t uint64_fns = {
static int
units_parse_u64(void *target, const char *value, char **errmsg,
-const void *params)
+const void *params, const char *key)
{
+ (void)key;
const unit_table_t *table = params;
tor_assert(table);
uint64_t *v = (uint64_t*)target;
@@ -235,8 +240,9 @@ units_parse_u64(void *target, const char *value, char
**errmsg,
static int
units_parse_int(void *target, const char *value, char **errmsg,
- const void *params)
+const void *params, const char *key)
{
+ (void)key;
const unit_table_t *table = params;
tor_assert(table);
int *v = (int*)target;
@@ -283,10 +289,11 @@ static const var_type_fns_t interval_fns = {
static int
double_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
double *v = (double*)target;
char *endptr=NULL;
errno = 0;
@@ -347,8 +354,9 @@ typedef struct enumeration_table_t {
static int
enum_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
+ (void)key;
const enumeration_table_t *table = params;
int *p = (int *)target;
for (; table->name; ++table) {
@@ -422,9 +430,10 @@ static const var_type_fns_t enum_fns = {
static int
time_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void) params;
+ (void) key;
time_t *p = target;
if (parse_iso_time(value, p) < 0) {
tor_asprintf(errmsg, "Invalid time %s", escaped(value));
@@ -466,10 +475,11 @@ static const var_type_fns_t time_fns = {
static int
csv_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
(void)errmsg;
+ (void)key;
smartlist_t **sl = (smartlist_t**)target;
*sl = smartlist_new();
smartlist_split_string(*sl, value, ",",
@@ -515,7 +525,7 @@ static const var_type_fns_t csv_fns = {
static int
legacy_csv_interval_parse(void *target, const char *value, char **errmsg,
- const void *params)
+ const void *params, const char *key)
{
(void)params;
/* We used to have entire smartlists here. But now that all of our
@@ -529,7 +539,7 @@ legacy_csv_interval_parse(void *target, const char *value,
char **errmsg,
val = tmp;
}
- int rv = units_parse_int(target, val, errmsg, _units);
+ int rv = units_parse_int(target, val, errmsg, _units, key);
tor_free(tmp);
return rv;
}
@@ -693,14 +703,17 @@ static const var_type_fns_t linelist_s_fns = {
static int
[tor-commits] [tor/maint-0.4.2] test/parseconf: Add tests for ignored options
commit 9be51e8a8e0663a60359f720664defdb4d1d593a Author: teor Date: Mon Nov 11 12:01:31 2019 +1000 test/parseconf: Add tests for ignored options These tests will also pass on 0.4.3, with the original implementation, and with the new implementation in 32404. Part of 32295 and 32404. --- src/test/conf_examples/obsolete_1/expected | 0 src/test/conf_examples/obsolete_1/torrc| 68 ++ src/test/conf_examples/obsolete_2/expected | 0 src/test/conf_examples/obsolete_2/torrc| 2 + 4 files changed, 70 insertions(+) diff --git a/src/test/conf_examples/obsolete_1/expected b/src/test/conf_examples/obsolete_1/expected new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/obsolete_1/torrc b/src/test/conf_examples/obsolete_1/torrc new file mode 100644 index 0..3cd9a6d77 --- /dev/null +++ b/src/test/conf_examples/obsolete_1/torrc @@ -0,0 +1,68 @@ +# These options are obsolete as of 0.4.2 +AllowDotExit +AllowInvalidNodes +AllowSingleHopCircuits +AllowSingleHopExits +AlternateHSAuthority +AuthDirBadDir +AuthDirBadDirCCs +AuthDirRejectUnlisted +AuthDirListBadDirs +AuthDirMaxServersPerAuthAddr +CircuitIdleTimeout +ControlListenAddress +DirListenAddress +DisableIOCP +DisableV2DirectoryInfo_ +DynamicDHGroups +DNSListenAddress +TestingEnableTbEmptyEvent +ExcludeSingleHopRelays +FallbackNetworkstatusFile +FastFirstHopPK +FetchV2Networkstatus +Group +HidServDirectoryV2 +CloseHSClientCircuitsImmediatelyOnTimeout +CloseHSServiceRendCircuitsImmediatelyOnTimeout +MaxOnionsPending +NamingAuthoritativeDirectory +NATDListenAddress +PredictedPortsRelevanceTime +WarnUnsafeSocks +ORListenAddress +PathBiasDisableRate +PathBiasScaleFactor +PathBiasMultFactor +PathBiasUseCloseCounts +PortForwarding +PortForwardingHelper +PreferTunneledDirConns +RecommendedPackages +RunTesting +SchedulerLowWaterMark__ +SchedulerHighWaterMark__ +SchedulerMaxFlushCells__ +SocksListenAddress +StrictEntryNodes +StrictExitNodes +Support022HiddenServices +Tor2webMode +Tor2webRendezvousPoints +TLSECGroup +TransListenAddress +TunnelDirConns +UseEntryGuardsAsDirGuards +UseNTorHandshake +UserspaceIOCPBuffers +V1AuthoritativeDirectory +V2AuthoritativeDirectory +VoteOnHidServDirectoriesV2 +UseFilteringSSLBufferevents +__UseFilteringSSLBufferevents +TestingConsensusMaxDownloadTries +ClientBootstrapConsensusMaxDownloadTries +ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries +TestingDescriptorMaxDownloadTries +TestingMicrodescMaxDownloadTries +TestingCertMaxDownloadTries diff --git a/src/test/conf_examples/obsolete_2/expected b/src/test/conf_examples/obsolete_2/expected new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/obsolete_2/torrc b/src/test/conf_examples/obsolete_2/torrc new file mode 100644 index 0..4f78d4762 --- /dev/null +++ b/src/test/conf_examples/obsolete_2/torrc @@ -0,0 +1,2 @@ +# This option has been obsolete for some time +AllowDotExit ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [snowflake/master] Stop using custom websocket library in server
commit c417fd5599c5d39951c606856c69a9f05941afd3
Author: Arlo Breault
Date: Wed Oct 16 21:00:13 2019 -0400
Stop using custom websocket library in server
Trac: 31028
---
.travis.yml | 2 +-
server/server.go | 88 +---
2 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 9ed48bb..2f02f74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,8 @@ install:
- go get -u github.com/keroserene/go-webrtc
- go get -u github.com/pion/webrtc
- go get -u github.com/dchest/uniuri
+- go get -u github.com/gorilla/websocket
- go get -u git.torproject.org/pluggable-transports/goptlib.git
-- go get -u git.torproject.org/pluggable-transports/websocket.git/websocket
- go get -u google.golang.org/appengine
- go get -u golang.org/x/crypto/acme/autocert
- go get -u golang.org/x/net/http2
diff --git a/server/server.go b/server/server.go
index b1b566a..d111fce 100644
--- a/server/server.go
+++ b/server/server.go
@@ -21,7 +21,7 @@ import (
pt "git.torproject.org/pluggable-transports/goptlib.git"
"git.torproject.org/pluggable-transports/snowflake.git/common/safelog"
- "git.torproject.org/pluggable-transports/websocket.git/websocket"
+ "github.com/gorilla/websocket"
"golang.org/x/crypto/acme/autocert"
"golang.org/x/net/http2"
)
@@ -53,50 +53,60 @@ additional HTTP listener on port 80 to work with ACME.
// An abstraction that makes an underlying WebSocket connection look like an
// io.ReadWriteCloser.
type webSocketConn struct {
- Ws *websocket.WebSocket
- messageBuf []byte
+ Ws *websocket.Conn
+ r io.Reader
}
// Implements io.Reader.
func (conn *webSocketConn) Read(b []byte) (n int, err error) {
- for len(conn.messageBuf) == 0 {
- var m websocket.Message
- m, err = conn.Ws.ReadMessage()
- if err != nil {
- return
- }
- if m.Opcode == 8 {
- err = io.EOF
- return
- }
- if m.Opcode != 2 {
- err = fmt.Errorf("got non-binary opcode %d", m.Opcode)
- return
+ var opCode int
+ if conn.r == nil {
+ // New message
+ var r io.Reader
+ for {
+ if opCode, r, err = conn.Ws.NextReader(); err != nil {
+ return
+ }
+ if opCode != websocket.BinaryMessage && opCode !=
websocket.TextMessage {
+ continue
+ }
+
+ conn.r = r
+ break
}
- conn.messageBuf = m.Payload
}
- n = copy(b, conn.messageBuf)
- conn.messageBuf = conn.messageBuf[n:]
-
+ n, err = conn.r.Read(b)
+ if err != nil {
+ if err == io.EOF {
+ // Message finished
+ conn.r = nil
+ err = nil
+ }
+ }
return
}
// Implements io.Writer.
-func (conn *webSocketConn) Write(b []byte) (int, error) {
- err := conn.Ws.WriteMessage(2, b)
- return len(b), err
+func (conn *webSocketConn) Write(b []byte) (n int, err error) {
+ var w io.WriteCloser
+ if w, err = conn.Ws.NextWriter(websocket.BinaryMessage); err != nil {
+ return
+ }
+ if n, err = w.Write(b); err != nil {
+ return
+ }
+ err = w.Close()
+ return
}
// Implements io.Closer.
func (conn *webSocketConn) Close() error {
- // Ignore any error in trying to write a Close frame.
- _ = conn.Ws.WriteFrame(8, nil)
- return conn.Ws.Conn.Close()
+ return conn.Ws.Close()
}
// Create a new webSocketConn.
-func newWebSocketConn(ws *websocket.WebSocket) webSocketConn {
+func newWebSocketConn(ws *websocket.Conn) webSocketConn {
var conn webSocketConn
conn.Ws = ws
return conn
@@ -145,16 +155,22 @@ func clientAddr(clientIPParam string) string {
return ({IP: clientIP, Port: 1, Zone: ""}).String()
}
-func webSocketHandler(ws *websocket.WebSocket) {
- // Undo timeouts on HTTP request handling.
- if err := ws.Conn.SetDeadline(time.Time{}); err != nil {
- log.Printf("unable to set deadlines with error: %v", err)
+var upgrader = websocket.Upgrader{}
+
+type HTTPHandler struct{}
+
+func (handler *HTTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+ ws, err := upgrader.Upgrade(w, r, nil)
+ if err != nil {
+ log.Println(err)
+ return
}
+
conn := newWebSocketConn(ws)
defer conn.Close()
// Pass the address of client as the remote address of incoming
[tor-commits] [snowflake/master] Restore sending close message before closing
commit abefae158716b9f56692ea16336c1f8185eda27e
Author: Arlo Breault
Date: Mon Nov 11 16:59:33 2019 -0500
Restore sending close message before closing
And simplify EOF check.
---
server/server.go | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/server.go b/server/server.go
index d111fce..ce804fc 100644
--- a/server/server.go
+++ b/server/server.go
@@ -77,12 +77,10 @@ func (conn *webSocketConn) Read(b []byte) (n int, err
error) {
}
n, err = conn.r.Read(b)
- if err != nil {
- if err == io.EOF {
- // Message finished
- conn.r = nil
- err = nil
- }
+ if err == io.EOF {
+ // Message finished
+ conn.r = nil
+ err = nil
}
return
}
@@ -102,6 +100,8 @@ func (conn *webSocketConn) Write(b []byte) (n int, err
error) {
// Implements io.Closer.
func (conn *webSocketConn) Close() error {
+ // Ignore any error in trying to write a Close frame.
+ _ = conn.Ws.WriteControl(websocket.CloseMessage, []byte{},
time.Now().Add(time.Second))
return conn.Ws.Close()
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [donate/master] Fixed utf-8 character that was messing up translations
commit c7d85d0ad590792a520a815bcba78a32b9d6b949 Author: peterh Date: Mon Nov 11 13:27:43 2019 -0800 Fixed utf-8 character that was messing up translations A utf-8 emdash was causinga warning with the translation stuff. --- .../dist/champions-of-privacy-white.a0dd8202.png | Bin 228759 -> 0 bytes public/dist/copy.958d2495.svg | 1 - .../dist/defenders-of-privacy-white.647dca98.png | Bin 214940 -> 0 bytes .../dist/end-of-2019-campaign-header.c377cdb9.png | Bin 263240 -> 0 bytes public/dist/facebook.ff210557.svg | 20 -- public/dist/github.4e95ff58.svg| 20 -- public/dist/instagram.97cb06de.svg | 20 -- public/dist/linkedin.59c8960f.svg | 20 -- public/dist/mastodon.98b5371a.svg | 20 -- public/dist/tor-header-campaign-2018.078dce4a.svg | 142 -- public/dist/tor-header-campaign-2018.ab4c974a.svg | 142 -- public/dist/twitter.74a014ed.svg | 20 -- templates/champions-of-privacy.twig| 2 +- translation/out/messages.pot | 313 +++-- 14 files changed, 167 insertions(+), 553 deletions(-) diff --git a/public/dist/champions-of-privacy-white.a0dd8202.png b/public/dist/champions-of-privacy-white.a0dd8202.png deleted file mode 100644 index f0904d41.. Binary files a/public/dist/champions-of-privacy-white.a0dd8202.png and /dev/null differ diff --git a/public/dist/copy.958d2495.svg b/public/dist/copy.958d2495.svg deleted file mode 100644 index 4e0b09f1.. --- a/public/dist/copy.958d2495.svg +++ /dev/null @@ -1 +0,0 @@ -http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-copy"> \ No newline at end of file diff --git a/public/dist/defenders-of-privacy-white.647dca98.png b/public/dist/defenders-of-privacy-white.647dca98.png deleted file mode 100644 index 37c35ef3.. Binary files a/public/dist/defenders-of-privacy-white.647dca98.png and /dev/null differ diff --git a/public/dist/end-of-2019-campaign-header.c377cdb9.png b/public/dist/end-of-2019-campaign-header.c377cdb9.png deleted file mode 100644 index 248ccc91.. Binary files a/public/dist/end-of-2019-campaign-header.c377cdb9.png and /dev/null differ diff --git a/public/dist/facebook.ff210557.svg b/public/dist/facebook.ff210557.svg deleted file mode 100644 index 34fe86aa.. --- a/public/dist/facebook.ff210557.svg +++ /dev/null @@ -1,20 +0,0 @@ - -http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;> - -0BC8DFFF-C6F0-44B0-A296-76F4BD4E6560 -Created with sketchtool. - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/dist/github.4e95ff58.svg b/public/dist/github.4e95ff58.svg deleted file mode 100644 index 2c147de5.. --- a/public/dist/github.4e95ff58.svg +++ /dev/null @@ -1,20 +0,0 @@ - -http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;> - -B56BD0F9-AFB4-4A2A-8480-F1768DB4B584 -Created with sketchtool. - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/dist/instagram.97cb06de.svg b/public/dist/instagram.97cb06de.svg deleted file mode 100644 index 0215201a.. --- a/public/dist/instagram.97cb06de.svg +++ /dev/null @@ -1,20 +0,0 @@ - -http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;> - -E19A5313-E9FF-463A-BB3B-8EDD62B053A9 -Created with sketchtool. - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/dist/linkedin.59c8960f.svg b/public/dist/linkedin.59c8960f.svg deleted file mode 100644 index 9556aa39.. --- a/public/dist/linkedin.59c8960f.svg +++ /dev/null @@ -1,20 +0,0 @@ - -http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;> - -4892B42B-AD2A-485C-B3A8-F4045EFC4353 -Created with sketchtool. - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/dist/mastodon.98b5371a.svg b/public/dist/mastodon.98b5371a.svg deleted file mode 100644
[tor-commits] [donate/master] Update donate-faq
commit 925eec2862b52389dd2a2b07db8d40bba968ce57
Author: hiro
Date: Mon Nov 11 20:52:43 2019 +0100
Update donate-faq
---
templates/donor-faq.twig | 17 ++---
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/templates/donor-faq.twig b/templates/donor-faq.twig
index df19def6..4b3ede3f 100644
--- a/templates/donor-faq.twig
+++ b/templates/donor-faq.twig
@@ -173,7 +173,12 @@
{% trans %}Can I donate hardware?{% endtrans
%}
- {% trans %}Typically no, we don't encourage people
to donate hardware.{% endtrans %} {% trans %}But if you want to make a hardware
donation that you think might be especially useful for us, please mail giving(at)torproject.org.{% endtrans %}
+ {% trans %}Typically no, we don't encourage people
to donate hardware. But if you want to make a hardware donation that you think
might be especially useful for us, please mail giving(at)torproject.org.{%
endtrans %}
+ {% trans %}The Tor project manages multiple machines in multiple
locations, all aimed at helping the Tor project develop software design to
protect people's anonymity. It does not, in itself, run the Tor network.{%
endtrans %}
+ {% trans %}Machines for helping the Tor project develop software are
generally paid for by the Tor project or donated by friendly organisations. If
you wish to donate hardware resources, it's generally expected the hardware
will be fully under the control of the https://help.torproject.org/tsa/;>Tor Sysadmin Team. Details of the
requirements are documented in the https://help.torproject.org/tsa/doc/hardware-requirements/;>team
wiki.{% endtrans %}
+ {% trans %}It's possible for the Tor project to run only *services*
on top of an already existing operating system as well, but we prefer to run
the entire stack ourselves.{% endtrans %}
+ {% trans %}https://help.torproject.org/tsa/;>Tor Sysadmin
Team{% endtrans %}
+ {% trans %}https://help.torproject.org/tsa/doc/hardware-requirements/;>Hardware
requirements{% endtrans %}
{% trans %}Can I donate my time?{% endtrans
%}
@@ -188,16 +193,6 @@
{% trans %}Sure.{% endtrans %} {% trans %}Just
mail us at giving(at)torproject.org.{% endtrans
%}
- {% trans %}Can I donate hardware?{% endtrans
%}
- {% trans %}Typically no, we don't encourage people
to donate hardware. But if you want to make a hardware donation that you think
might be especially useful for us, please mail giving(at)torproject.org.{%
endtrans %}
- {% trans %}The Tor project manages multiple machines in multiple
locations, all aimed at helping the Tor project develop software design to
protect people's anonymity. It does not, in itself, run the Tor network.{%
endtrans %}
- {% trans %}Machines for helping the Tor project develop software are
generally paid for by the Tor project or donated by friendly organisations. If
you wish to donate hardware resources, it's generally expected the hardware
will be fully under the control of the [Tor
-sysadmin team][]. Details of the requirements are documented in the https://help.torproject.org/tsa/doc/hardware-requirements/;>team
wiki.{% endtrans %}
- {% trans %}It's possible for the Tor project to run only *services*
on top of an already existing operating system as well, but we prefer to run
the entire stack ourselves.{% endtrans %}
- {% trans %}https://help.torproject.org/tsa/;>Tor Sysadmin
Team{% endtrans %}
- {% trans %}https://help.torproject.org/tsa/doc/hardware-requirements/;>Hardware
requirements{% endtrans %}
-
-
{% trans %}Will the Tor Project accept
donations from anybody, or do you reserve the right to reject support from
specific organizations or individuals?{% endtrans %}
{% trans %}We do reserve the right to reject a
donation.{% endtrans %} {% trans %}To date though, we haven't exercised that
right.{% endtrans %} {% trans %}We are happy that a broad range of people use
and support Tor.{% endtrans %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
commit 6eb8fb4a75e1a1a9322a6389aae531f071c46b42 Author: Translation commit bot Date: Mon Nov 11 20:15:48 2019 + https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties --- fr/exonerator.properties | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/fr/exonerator.properties b/fr/exonerator.properties index fe037c32e..86424e57e 100644 --- a/fr/exonerator.properties +++ b/fr/exonerator.properties @@ -9,32 +9,32 @@ summary.serverproblem.dbnoconnect.body.link=nous en informer summary.serverproblem.dbempty.title=Problème de serveur summary.serverproblem.dbempty.body.text=La base de données semble être vide. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %s. summary.serverproblem.dbempty.body.link=nous en informer -summary.invalidparams.notimestamp.title=Aucune date nâa été donnée en paramètre -summary.invalidparams.notimestamp.body=Désolé, vous devez aussi indiquer une date. -summary.invalidparams.noip.title=Aucune adresse IP nâa été donnée en paramètre -summary.invalidparams.noip.body=Désolé, vous devez aussi fournir une adresse IP. -summary.invalidparams.timestamprange.title=Date hors période couverte -summary.invalidparams.timestamprange.body=Désolé, la base de données ne contient aucune donnée de %s. Veuillez choisir une date entre %s et %s. -summary.invalidparams.invalidip.title=Adresse IP invalide +summary.invalidparams.notimestamp.title=Aucun paramètre de date nâa été donné +summary.invalidparams.notimestamp.body=Désolé, vous devez aussi indiquer un paramètre de date. +summary.invalidparams.noip.title=Aucun paramètre dâadresse IP nâa été donné +summary.invalidparams.noip.body=Désolé, vous devez aussi indiquer un paramètre dâadresse IP. +summary.invalidparams.timestamprange.title=Le paramètre de date est hors limite +summary.invalidparams.timestamprange.body=Désolé, la base de données ne comprend aucune donnée de %s. Veuillez choisir une date entre %s et %s. +summary.invalidparams.invalidip.title=Le paramètre dâadresse IP est invalide summary.invalidparams.invalidip.body=Désolé, %s nâest pas une adresse IP valide. Les formats dâadresse IP attendus sont %s ou %s. -summary.invalidparams.invalidtimestamp.title=Date invalide +summary.invalidparams.invalidtimestamp.title=Le paramètre de date est invalide summary.invalidparams.invalidtimestamp.body=Désolé, %s nâest pas une date valide. Le format de date attendu est %s. summary.invalidparams.timestamptoorecent.title=Le paramètre de date est trop récent -summary.invalidparams.timestamptoorecent.body=La base de données pourrait ne pas encore contenir suffisamment de données pour répondre correctement à cette requête. Les dernières données acceptées datent dâavant-hier. Veuillez répéter votre recherche dans un jour. +summary.invalidparams.timestamptoorecent.body=La base de données pourrait ne pas encore comprendre suffisamment de données pour répondre correctement à cette requête. Les dernières données acceptées datent dâavant-hier. Veuillez répéter votre recherche dans un jour. summary.serverproblem.nodata.title=Problème de serveur -summary.serverproblem.nodata.body.text=La base de données ne contient aucune donnée pour la date demandée. Veuillez ressayer ultérieurement. Si le problème perdure, veuillez %sâ! +summary.serverproblem.nodata.body.text=La base de données ne comprend aucune donnée pour la date demandée. Veuillez ressayer ultérieurement. Si le problème perdure, veuillez %s. summary.serverproblem.nodata.body.link=nous en informer -summary.negativesamenetwork.title=Résultat négatif +summary.negativesamenetwork.title=Le résultat est négatif summary.negativesamenetwork.body=Nous nâavons pas trouvé lâadresse IP %s, le %s ou à un jour près. Mais nous avons trouvé dâautres adresses IP de relais Tor dans le même réseau /%d aux alentours de cette date : -summary.positive.title=Résultat positif +summary.positive.title=Le résultat est positif summary.positive.body=Nous avons trouvé un ou plusieurs relais Tor à lâadresse IP %s probablement connus des clients Tor le %s ou à un jour près. -summary.negative.title=Résultat négatif +summary.negative.title=Le résultat est négatif summary.negative.body=Nous nâavons pas trouvé lâadresse IP %s, le %s ou à un jour près. technicaldetails.heading=Détails techniques technicaldetails.pre=Recherche de lâadresse IP %s, le %s ou à un jour près. Des clients Tor pourraient avoir choisi ce ou ces relais Tor pour construire des circuits. -technicaldetails.colheader.timestamp=Date et heure (UTC) +technicaldetails.colheader.timestamp=Estampille temporelle (UTC) technicaldetails.colheader.ip=Adresses IP -technicaldetails.colheader.fingerprint=Empreinte +technicaldetails.colheader.fingerprint=Empreinte dâidentité
[tor-commits] [translation/exoneratorproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed
commit 584526a607290f1369517e5f2155e8c492b8d240 Author: Translation commit bot Date: Mon Nov 11 20:15:54 2019 + https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed --- fr/exonerator.properties | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/fr/exonerator.properties b/fr/exonerator.properties index fe037c32e..86424e57e 100644 --- a/fr/exonerator.properties +++ b/fr/exonerator.properties @@ -9,32 +9,32 @@ summary.serverproblem.dbnoconnect.body.link=nous en informer summary.serverproblem.dbempty.title=Problème de serveur summary.serverproblem.dbempty.body.text=La base de données semble être vide. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %s. summary.serverproblem.dbempty.body.link=nous en informer -summary.invalidparams.notimestamp.title=Aucune date nâa été donnée en paramètre -summary.invalidparams.notimestamp.body=Désolé, vous devez aussi indiquer une date. -summary.invalidparams.noip.title=Aucune adresse IP nâa été donnée en paramètre -summary.invalidparams.noip.body=Désolé, vous devez aussi fournir une adresse IP. -summary.invalidparams.timestamprange.title=Date hors période couverte -summary.invalidparams.timestamprange.body=Désolé, la base de données ne contient aucune donnée de %s. Veuillez choisir une date entre %s et %s. -summary.invalidparams.invalidip.title=Adresse IP invalide +summary.invalidparams.notimestamp.title=Aucun paramètre de date nâa été donné +summary.invalidparams.notimestamp.body=Désolé, vous devez aussi indiquer un paramètre de date. +summary.invalidparams.noip.title=Aucun paramètre dâadresse IP nâa été donné +summary.invalidparams.noip.body=Désolé, vous devez aussi indiquer un paramètre dâadresse IP. +summary.invalidparams.timestamprange.title=Le paramètre de date est hors limite +summary.invalidparams.timestamprange.body=Désolé, la base de données ne comprend aucune donnée de %s. Veuillez choisir une date entre %s et %s. +summary.invalidparams.invalidip.title=Le paramètre dâadresse IP est invalide summary.invalidparams.invalidip.body=Désolé, %s nâest pas une adresse IP valide. Les formats dâadresse IP attendus sont %s ou %s. -summary.invalidparams.invalidtimestamp.title=Date invalide +summary.invalidparams.invalidtimestamp.title=Le paramètre de date est invalide summary.invalidparams.invalidtimestamp.body=Désolé, %s nâest pas une date valide. Le format de date attendu est %s. summary.invalidparams.timestamptoorecent.title=Le paramètre de date est trop récent -summary.invalidparams.timestamptoorecent.body=La base de données pourrait ne pas encore contenir suffisamment de données pour répondre correctement à cette requête. Les dernières données acceptées datent dâavant-hier. Veuillez répéter votre recherche dans un jour. +summary.invalidparams.timestamptoorecent.body=La base de données pourrait ne pas encore comprendre suffisamment de données pour répondre correctement à cette requête. Les dernières données acceptées datent dâavant-hier. Veuillez répéter votre recherche dans un jour. summary.serverproblem.nodata.title=Problème de serveur -summary.serverproblem.nodata.body.text=La base de données ne contient aucune donnée pour la date demandée. Veuillez ressayer ultérieurement. Si le problème perdure, veuillez %sâ! +summary.serverproblem.nodata.body.text=La base de données ne comprend aucune donnée pour la date demandée. Veuillez ressayer ultérieurement. Si le problème perdure, veuillez %s. summary.serverproblem.nodata.body.link=nous en informer -summary.negativesamenetwork.title=Résultat négatif +summary.negativesamenetwork.title=Le résultat est négatif summary.negativesamenetwork.body=Nous nâavons pas trouvé lâadresse IP %s, le %s ou à un jour près. Mais nous avons trouvé dâautres adresses IP de relais Tor dans le même réseau /%d aux alentours de cette date : -summary.positive.title=Résultat positif +summary.positive.title=Le résultat est positif summary.positive.body=Nous avons trouvé un ou plusieurs relais Tor à lâadresse IP %s probablement connus des clients Tor le %s ou à un jour près. -summary.negative.title=Résultat négatif +summary.negative.title=Le résultat est négatif summary.negative.body=Nous nâavons pas trouvé lâadresse IP %s, le %s ou à un jour près. technicaldetails.heading=Détails techniques technicaldetails.pre=Recherche de lâadresse IP %s, le %s ou à un jour près. Des clients Tor pourraient avoir choisi ce ou ces relais Tor pour construire des circuits. -technicaldetails.colheader.timestamp=Date et heure (UTC) +technicaldetails.colheader.timestamp=Estampille temporelle (UTC) technicaldetails.colheader.ip=Adresses IP -technicaldetails.colheader.fingerprint=Empreinte +technicaldetails.colheader.fingerprint=Empreinte dâidentité
[tor-commits] [translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
commit 18a4b7776f98c36e0befa9f2af66bb973528dc29 Author: Translation commit bot Date: Mon Nov 11 19:45:47 2019 + https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties --- fr/exonerator.properties | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/exonerator.properties b/fr/exonerator.properties index a34b03a3a..fe037c32e 100644 --- a/fr/exonerator.properties +++ b/fr/exonerator.properties @@ -1,16 +1,16 @@ -form.explanation=Saisir une adresse IP et une date afin de savoir si lâadresse a été utilisée comme relais Tor : +form.explanation=Saisissez une adresse IP et une date afin de savoir si lâadresse a été utilisée comme relais Tor : form.ip.label=Adresse IP form.timestamp.label=Date form.search.label=Chercher summary.heading=Résumé summary.serverproblem.dbnoconnect.title=Problème de serveur -summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter à la base de données. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %sâ! +summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter à la base de données. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %s. summary.serverproblem.dbnoconnect.body.link=nous en informer summary.serverproblem.dbempty.title=Problème de serveur -summary.serverproblem.dbempty.body.text=La base de données semble être vide. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %sâ! +summary.serverproblem.dbempty.body.text=La base de données semble être vide. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %s. summary.serverproblem.dbempty.body.link=nous en informer summary.invalidparams.notimestamp.title=Aucune date nâa été donnée en paramètre -summary.invalidparams.notimestamp.body=Désolé, vous devez aussi préciser une date. +summary.invalidparams.notimestamp.body=Désolé, vous devez aussi indiquer une date. summary.invalidparams.noip.title=Aucune adresse IP nâa été donnée en paramètre summary.invalidparams.noip.body=Désolé, vous devez aussi fournir une adresse IP. summary.invalidparams.timestamprange.title=Date hors période couverte ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/exoneratorproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed
commit 135c7281d839fcbc591bb40fc6ca1c4a74594cac Author: Translation commit bot Date: Mon Nov 11 19:45:52 2019 + https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed --- fr/exonerator.properties | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/exonerator.properties b/fr/exonerator.properties index a34b03a3a..fe037c32e 100644 --- a/fr/exonerator.properties +++ b/fr/exonerator.properties @@ -1,16 +1,16 @@ -form.explanation=Saisir une adresse IP et une date afin de savoir si lâadresse a été utilisée comme relais Tor : +form.explanation=Saisissez une adresse IP et une date afin de savoir si lâadresse a été utilisée comme relais Tor : form.ip.label=Adresse IP form.timestamp.label=Date form.search.label=Chercher summary.heading=Résumé summary.serverproblem.dbnoconnect.title=Problème de serveur -summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter à la base de données. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %sâ! +summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter à la base de données. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %s. summary.serverproblem.dbnoconnect.body.link=nous en informer summary.serverproblem.dbempty.title=Problème de serveur -summary.serverproblem.dbempty.body.text=La base de données semble être vide. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %sâ! +summary.serverproblem.dbempty.body.text=La base de données semble être vide. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %s. summary.serverproblem.dbempty.body.link=nous en informer summary.invalidparams.notimestamp.title=Aucune date nâa été donnée en paramètre -summary.invalidparams.notimestamp.body=Désolé, vous devez aussi préciser une date. +summary.invalidparams.notimestamp.body=Désolé, vous devez aussi indiquer une date. summary.invalidparams.noip.title=Aucune adresse IP nâa été donnée en paramètre summary.invalidparams.noip.body=Désolé, vous devez aussi fournir une adresse IP. summary.invalidparams.timestamprange.title=Date hors période couverte ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 7058fb03890b6fbe7f2291789eedbbe1a3412b66 Author: Translation commit bot Date: Mon Nov 11 17:53:58 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+it.po | 81 +- 1 file changed, 69 insertions(+), 12 deletions(-) diff --git a/contents+it.po b/contents+it.po index b57866e1b..41263a088 100644 --- a/contents+it.po +++ b/contents+it.po @@ -6266,6 +6266,9 @@ msgid "" " learned that sometimes Tor relays expose their socks port to the world. We " "recommend that you bind your socksport to local networks only." msgstr "" +"Un altro motivo è che i gruppi che cercano proxy aperti su Internet hanno " +"appreso che a volte i relè Tor espongono la loro porta socks al mondo. Ti " +"consigliamo di associare la tua porta socks solo alle reti locali." #: https//support.torproject.org/operators/why-i-get-portscanned-more-often/ #: (content/operators/why-i-get-portscanned-more-often/contents+en.lrquestion.description) @@ -6275,16 +6278,20 @@ msgid "" "relays](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide/Security)" " for more suggestions." msgstr "" +"In ogni caso, è necessario tenersi aggiornati con la sicurezza. Vedi questo " +"articolo sulla [sicurezza per i relè Tor] " +"(https://trac.torproject.org/projects/tor/wiki/TorRelayGuide/Security) per " +"ulteriori suggerimenti." #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.title) msgid "Why isn't my relay being used more?" -msgstr "" +msgstr "Perché il mio relè non viene utilizzato di più?" #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.description) msgid "If your relay is relatively new then give it time." -msgstr "" +msgstr "Se il tuo relè è relativamente nuovo, dagli tempo." #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.description) @@ -6294,6 +6301,10 @@ msgid "" "capacity and, over time, directs more traffic there until it reaches an " "optimal load." msgstr "" +"Tor decide quali relè utilizzare euristicamente in base ai rapporti delle " +"Autorità di Banda. Queste autorità effettuano misurazioni della capacità del" +" relè e, nel tempo, vi indirizzano più traffico fino a raggiungere un carico" +" ottimale." #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.description) @@ -6301,6 +6312,9 @@ msgid "" "The lifecycle of a new relay is explained in more depth in [this blog " "post](https://blog.torproject.org/blog/lifecycle-of-a-new-relay)." msgstr "" +"Il ciclo di vita di un nuovo relè è spiegato in modo più approfondito in " +"[questo blog post](https://blog.torproject.org/blog/lifecycle-of-a-new-; +"relay)." #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.description) @@ -6309,11 +6323,14 @@ msgid "" "asking on the [tor-relays list](https://lists.torproject.org/cgi-; "bin/mailman/listinfo/tor-relays/)." msgstr "" +"Se stai utilizzato un relè da un po' e hai ancora problemi, prova a chiedere" +" nell'[elenco relè](https://lists.torproject.org/cgi-bin/mailman/listinfo; +"/tor-relays/)." #: https//support.torproject.org/operators/wrong-ip/ #: (content/operators/wrong-ip/contents+en.lrquestion.title) msgid "My relay is picking the wrong IP address." -msgstr "" +msgstr "Il mio relè sta scegliendo l'indirizzo IP sbagliato." #: https//support.torproject.org/operators/wrong-ip/ #: (content/operators/wrong-ip/contents+en.lrquestion.description) @@ -6322,6 +6339,9 @@ msgid "" " resolving that hostname. Often people have old entries in their /etc/hosts " "file that point to old IP addresses." msgstr "" +"Tor indovina il suo indirizzo IP chiedendo al computer il nome host e " +"risolvendo tale nome host. Spesso le persone hanno voci vecchie che puntano " +"a vecchi indirizzi IP nel loro file /etch/hosts." #: https//support.torproject.org/operators/wrong-ip/ #: (content/operators/wrong-ip/contents+en.lrquestion.description) @@ -6331,6 +6351,10 @@ msgid "" "only has an internal IP address, see the following Support entry on dynamic " "IP addresses." msgstr "" +"Se ciò non risolve, dovresti utilizzare l'opzione di configurazione " +"\"Indirizzo\" per specificare l'IP che desideri selezionare. Se il tuo " +"computer è dietro un NAT e ha solo un indirizzo IP interno, vedi la seguente" +" voce Supporto su indirizzi IP dinamici." #: https//support.torproject.org/operators/wrong-ip/ #:
[tor-commits] [tor/master] Light grammar edits
commit 3d1a7d7dd7e10b9500953701cfd29b9aaa64862a
Author: Nick Mathewson
Date: Mon Nov 11 12:26:09 2019 -0500
Light grammar edits
---
src/lib/confmgt/unitparse.c | 8 +---
src/lib/intmath/muldiv.c| 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/lib/confmgt/unitparse.c b/src/lib/confmgt/unitparse.c
index 8cbf9903e..e8d9392ef 100644
--- a/src/lib/confmgt/unitparse.c
+++ b/src/lib/confmgt/unitparse.c
@@ -148,7 +148,7 @@ config_parse_units(const char *val, const unit_table_t *u,
int *ok)
d = u->multiplier * d;
if (d < 0) {
- log_warn(LD_CONFIG, "Negative value arised when parsing %s %s",
+ log_warn(LD_CONFIG, "Got a negative value while parsing %s %s",
val, u->unit);
*ok = 0;
goto done;
@@ -157,7 +157,8 @@ config_parse_units(const char *val, const unit_table_t *u,
int *ok)
// Some compilers may warn about casting a double to an unsigned type
// because they don't know if d is >= 0
if (d >= 0 && (d > (double)INT64_MAX || (uint64_t)d > INT64_MAX)) {
- log_warn(LD_CONFIG, "Overflow detected parsing %s %s", val, u->unit);
+ log_warn(LD_CONFIG, "Overflow detected while parsing %s %s",
+ val, u->unit);
*ok = 0;
goto done;
}
@@ -167,7 +168,8 @@ config_parse_units(const char *val, const unit_table_t *u,
int *ok)
v = tor_mul_u64_nowrap(v, u->multiplier);
if (v > INT64_MAX) {
- log_warn(LD_CONFIG, "Overflow detected parsing %s %s", val, u->unit);
+ log_warn(LD_CONFIG, "Overflow detected while parsing %s %s",
+ val, u->unit);
*ok = 0;
goto done;
}
diff --git a/src/lib/intmath/muldiv.c b/src/lib/intmath/muldiv.c
index 3330a4c56..bde1567cb 100644
--- a/src/lib/intmath/muldiv.c
+++ b/src/lib/intmath/muldiv.c
@@ -69,8 +69,8 @@ gcd64(uint64_t a, uint64_t b)
return a;
}
-/** Return the unsigned integer product of a and b, if overflow
- * is detected return UINT64_MAX instead. */
+/** Return the unsigned integer product of a and b. If overflow
+ * is detected, return UINT64_MAX instead. */
uint64_t
tor_mul_u64_nowrap(uint64_t a, uint64_t b)
{
___
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 'tor-github/pr/1338'
commit 7c3378fb8d37e1f22ae7f04012e3e57a16b7f2fc Merge: 01af3a55f 42ba3997d Author: Nick Mathewson Date: Mon Nov 11 12:20:14 2019 -0500 Merge remote-tracking branch 'tor-github/pr/1338' changes/ticket30920 | 3 +++ src/lib/confmgt/.may_include | 1 + src/lib/confmgt/unitparse.c | 35 +++ src/lib/intmath/muldiv.c | 14 ++ src/lib/intmath/muldiv.h | 2 ++ src/test/test_confparse.c| 17 ++--- src/test/test_util.c | 9 + 7 files changed, 74 insertions(+), 7 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Check memunit parsing for overflow in confparse
commit 42ba3997d64591822411fbbedd51a240dbbb5fab
Author: José M. Guisado
Date: Wed Sep 18 13:28:29 2019 +0200
Check memunit parsing for overflow in confparse
Before, when parsing memunits, if overflow occured it failed silently.
Use nowrap u64 math to detect overflow, compare to INT64_MAX and if
greater tell user and fail accordingly.
1500.5 TB fails double check as it a greater floating number than
(double)INT64_MAX
8388608.1 TB passes double check because it falls in the same value as
(double)INT64_MAX (which is 2^63), but will fail the int check because
(uint64_t)d, which is 2^63, is strictly greater than 2^63-1 (INT64_MAX).
Fixes #30920
Signed-off-by: José M. Guisado
---
changes/ticket30920 | 3 +++
src/lib/confmgt/.may_include | 1 +
src/lib/confmgt/unitparse.c | 35 +++
src/test/test_confparse.c| 17 ++---
4 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/changes/ticket30920 b/changes/ticket30920
new file mode 100644
index 0..d2fd8c9da
--- /dev/null
+++ b/changes/ticket30920
@@ -0,0 +1,3 @@
+ o Minor bugfix (configuration):
+- Check for multiplication overflow when parsing memory units inside
+ configuration. Fixes bug 30920; bugfix on 0.0.9rc1~46.
diff --git a/src/lib/confmgt/.may_include b/src/lib/confmgt/.may_include
index 256413391..5ff949f10 100644
--- a/src/lib/confmgt/.may_include
+++ b/src/lib/confmgt/.may_include
@@ -4,6 +4,7 @@ lib/conf/*.h
lib/confmgt/*.h
lib/container/*.h
lib/encoding/*.h
+lib/intmath/*.h
lib/log/*.h
lib/malloc/*.h
lib/string/*.h
diff --git a/src/lib/confmgt/unitparse.c b/src/lib/confmgt/unitparse.c
index c3ed8285a..8cbf9903e 100644
--- a/src/lib/confmgt/unitparse.c
+++ b/src/lib/confmgt/unitparse.c
@@ -15,6 +15,7 @@
#include "lib/log/util_bug.h"
#include "lib/string/parse_int.h"
#include "lib/string/util_string.h"
+#include "lib/intmath/muldiv.h"
#include
@@ -109,6 +110,7 @@ const struct unit_table_t time_msec_units[] = {
* table u, then multiply the number by the unit multiplier.
* On success, set *ok to 1 and return this product.
* Otherwise, set *ok to 0.
+ * Warns user when overflow or a negative value is detected.
*/
uint64_t
config_parse_units(const char *val, const unit_table_t *u, int *ok)
@@ -142,10 +144,35 @@ config_parse_units(const char *val, const unit_table_t
*u, int *ok)
for ( ;u->unit;++u) {
if (!strcasecmp(u->unit, cp)) {
- if (use_float)
-v = (uint64_t)(u->multiplier * d);
- else
-v *= u->multiplier;
+ if (use_float) {
+d = u->multiplier * d;
+
+if (d < 0) {
+ log_warn(LD_CONFIG, "Negative value arised when parsing %s %s",
+ val, u->unit);
+ *ok = 0;
+ goto done;
+}
+
+// Some compilers may warn about casting a double to an unsigned type
+// because they don't know if d is >= 0
+if (d >= 0 && (d > (double)INT64_MAX || (uint64_t)d > INT64_MAX)) {
+ log_warn(LD_CONFIG, "Overflow detected parsing %s %s", val, u->unit);
+ *ok = 0;
+ goto done;
+}
+
+v = (uint64_t) d;
+ } else {
+v = tor_mul_u64_nowrap(v, u->multiplier);
+
+if (v > INT64_MAX) {
+ log_warn(LD_CONFIG, "Overflow detected parsing %s %s", val, u->unit);
+ *ok = 0;
+ goto done;
+}
+ }
+
*ok = 1;
goto done;
}
diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c
index 5f29a22c1..e0c9b3f63 100644
--- a/src/test/test_confparse.c
+++ b/src/test/test_confparse.c
@@ -906,11 +906,22 @@ test_confparse_unitparse(void *args)
tt_assert(ok);
/* u64 overflow */
- /* our implementation does not currently detect this. See bug 30920. */
- /*
tt_u64_op(config_parse_memunit("2000 TB", ), OP_EQ, 0);
tt_assert(!ok);
- */
+ // This test fails the double check as the float representing 1500.5 TB
+ // is greater than (double) INT64_MAX
+ tt_u64_op(config_parse_memunit("1500.5 TB", ), OP_EQ, 0);
+ tt_assert(!ok);
+ // 8388608.1 TB passes double check because it falls in the same float
+ // value as (double)INT64_MAX (which is 2^63) due to precision.
+ // But will fail the int check because the unsigned representation of
+ // the float, which is 2^63, is strictly greater than INT64_MAX (2^63-1)
+ tt_u64_op(config_parse_memunit("8388608.1 TB", ), OP_EQ, 0);
+ tt_assert(!ok);
+
+ /* negative float */
+ tt_u64_op(config_parse_memunit("-1.5 GB", ), OP_EQ, 0);
+ tt_assert(!ok);
/* i32 overflow */
tt_int_op(config_parse_interval("1000 months", ), OP_EQ, -1);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add nowrap u64 multiplication function
commit f237529fff657bbbf8d2f2632337d9848446d7da
Author: José M. Guisado
Date: Wed Sep 18 12:30:28 2019 +0200
Add nowrap u64 multiplication function
Follows #30920
Signed-off-by: José M. Guisado
---
src/lib/intmath/muldiv.c | 14 ++
src/lib/intmath/muldiv.h | 2 ++
src/test/test_util.c | 9 +
3 files changed, 25 insertions(+)
diff --git a/src/lib/intmath/muldiv.c b/src/lib/intmath/muldiv.c
index 6a292db7b..3330a4c56 100644
--- a/src/lib/intmath/muldiv.c
+++ b/src/lib/intmath/muldiv.c
@@ -69,6 +69,20 @@ gcd64(uint64_t a, uint64_t b)
return a;
}
+/** Return the unsigned integer product of a and b, if overflow
+ * is detected return UINT64_MAX instead. */
+uint64_t
+tor_mul_u64_nowrap(uint64_t a, uint64_t b)
+{
+ if (a == 0 || b == 0) {
+return 0;
+ } else if (PREDICT_UNLIKELY(UINT64_MAX / a < b)) {
+return UINT64_MAX;
+ } else {
+return a*b;
+ }
+}
+
/* Given a fraction *numer / *denom, simplify it.
* Requires that the denominator is greater than 0. */
void
diff --git a/src/lib/intmath/muldiv.h b/src/lib/intmath/muldiv.h
index 64500b6dc..7aa0f9b23 100644
--- a/src/lib/intmath/muldiv.h
+++ b/src/lib/intmath/muldiv.h
@@ -18,6 +18,8 @@ unsigned round_to_next_multiple_of(unsigned number, unsigned
divisor);
uint32_t round_uint32_to_next_multiple_of(uint32_t number, uint32_t divisor);
uint64_t round_uint64_to_next_multiple_of(uint64_t number, uint64_t divisor);
+uint64_t tor_mul_u64_nowrap(uint64_t a, uint64_t b);
+
void simplify_fraction64(uint64_t *numer, uint64_t *denom);
/* Compute the CEIL of a divided by b, for nonnegative a
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 84834f4d6..90e1b080b 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -33,6 +33,7 @@
#include "lib/process/env.h"
#include "lib/process/pidfile.h"
#include "lib/intmath/weakrng.h"
+#include "lib/intmath/muldiv.h"
#include "lib/thread/numcpus.h"
#include "lib/math/fp.h"
#include "lib/math/laplace.h"
@@ -5973,6 +5974,14 @@ test_util_nowrap_math(void *arg)
tt_u64_op(UINT32_MAX, OP_EQ, tor_add_u32_nowrap(2, UINT32_MAX-1));
tt_u64_op(UINT32_MAX, OP_EQ, tor_add_u32_nowrap(UINT32_MAX, UINT32_MAX));
+ tt_u64_op(0, OP_EQ, tor_mul_u64_nowrap(0, 0));
+ tt_u64_op(1, OP_EQ, tor_mul_u64_nowrap(1, 1));
+ tt_u64_op(2, OP_EQ, tor_mul_u64_nowrap(2, 1));
+ tt_u64_op(4, OP_EQ, tor_mul_u64_nowrap(2, 2));
+ tt_u64_op(UINT64_MAX, OP_EQ, tor_mul_u64_nowrap(UINT64_MAX, 1));
+ tt_u64_op(UINT64_MAX, OP_EQ, tor_mul_u64_nowrap(2, UINT64_MAX));
+ tt_u64_op(UINT64_MAX, OP_EQ, tor_mul_u64_nowrap(UINT64_MAX, UINT64_MAX));
+
done:
;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 988ed1a72db00a5fc90fc0999fad1c8cb90add70 Author: Translation commit bot Date: Mon Nov 11 17:24:09 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+it.po | 66 +++--- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/contents+it.po b/contents+it.po index 542a4b458..b57866e1b 100644 --- a/contents+it.po +++ b/contents+it.po @@ -6035,6 +6035,8 @@ msgid "" "This probably accounts for most of the difference between your \"write\" " "byte count and your \"read\" byte count." msgstr "" +"Questo probabilmente spiega la maggior parte della differenza tra il " +"conteggio dei byte \"write\" e il conteggio dei byte \"read\"." #: https//support.torproject.org/operators/relay-write-more-bytes/ #: (content/operators/relay-write-more-bytes/contents+en.lrquestion.description) @@ -6044,11 +6046,15 @@ msgid "" "or ssh connection) and wrap it up into an entire 512 byte cell for transport" " through the Tor network." msgstr "" +"Un'altra eccezione minore si presenta quando si opera come nodo di uscita e " +"si leggono alcuni byte da una connessione di uscita (ad esempio una " +"connessione di messaggistica istantanea o ssh) e la si avvolge in un'intera " +"cella da 512 byte per il trasporto attraverso la rete Tor." #: https//support.torproject.org/operators/should-i-run-a-relay/ #: (content/operators/should-i-run-a-relay/contents+en.lrquestion.title) msgid "How do I decide if I should run a relay?" -msgstr "" +msgstr "Come faccio a decidere se dovrei eseguire un relè?" #: https//support.torproject.org/operators/should-i-run-a-relay/ #: (content/operators/should-i-run-a-relay/contents+en.lrquestion.description) @@ -6058,6 +6064,11 @@ msgid "" " please consider [running a Tor " "relay](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide)." msgstr "" +"Siamo alla ricerca di persone con connessioni Internet ragionevolmente " +"affidabili, con banda disponibile di almeno 10 Mbit/s (Mbps) in ogni " +"direzione. Se questa descrizione ti rappresenta, ti preghiamo di prendere in" +" considerazione [l'esecuzione di un relè " +"Tor](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide)." #: https//support.torproject.org/operators/should-i-run-a-relay/ #: (content/operators/should-i-run-a-relay/contents+en.lrquestion.description) @@ -6067,11 +6078,16 @@ msgid "" "support](https://community.torproject.org/relay/setup/brige). In that case " "you should have at least 1 MBit/s of available bandwidth." msgstr "" +"Anche se non disponi di almeno 10 Mbit/s di banda, puoi comunque aiutare la " +"rete Tor eseguendo un [Tor bridge con supporto " +"obfs4](https://community.torproject.org/relay/setup/brige). In questo caso " +"dovresti disporre di almeno 1MBit/s di banda. " #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.title) msgid "I want to upgrade/move my relay. How do I keep the same key?" msgstr "" +"Voglio aggiornare/spostare il mio relè. Come mantengo la stessa chiave?" #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.description) @@ -6081,6 +6097,10 @@ msgid "" "\"keys/ed25519_master_id_secret_key\" and \"keys/secret_id_key\" in your " "DataDirectory)." msgstr "" +"Quando aggiorni il tuo relè Tor o lo sposti su un altro computer, la parte " +"importante è mantenere le stesse chiavi di identità (memorizzate in " +"\"keys/ed25519_master_id_secret_key\" e \"keys/secret_id_key\" nella tua " +"DataDirectory)." #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.description) @@ -6089,6 +6109,9 @@ msgid "" "future is the recommended way to ensure the reputation of the relay won't be" " wasted." msgstr "" +"Conservare delle copie delle chiavi di identità in modo da poter " +"ripristinare un relè in futuro è il modo raccomandato per garantire che la " +"reputazione del relè non venga sprecata." #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.description) @@ -6097,6 +6120,9 @@ msgid "" "torrc and the same DataDirectory, then the upgrade should just work and your" " relay will keep using the same key." msgstr "" +"Ciò significa che se stai aggiornando il tuo relè Tor e mantieni lo stesso " +"torrc e la stessa DataDirectory, l'aggiornamento dovrebbe funzionare e il " +"tuo relè continuerà a usare la stessa chiave." #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.description) @@ -6104,6 +6130,8 @@ msgid "" "If you need to pick a new DataDirectory, be sure to copy your old " "keys/ed25519_master_id_secret_key and keys/secret_id_key over." msgstr "" +"Se devi scegliere una nuova
[tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
commit eeba131d24d0f733b0235193eddd161fecd7a5a7 Author: Translation commit bot Date: Mon Nov 11 17:23:14 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings --- eu/network-settings.dtd | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eu/network-settings.dtd b/eu/network-settings.dtd index e5738c585..fb5d4183a 100644 --- a/eu/network-settings.dtd +++ b/eu/network-settings.dtd @@ -28,16 +28,16 @@ - + - + - + @@ -63,7 +63,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-securitylevelproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties
commit 5e06168d65b101353db0678e06aa4a6815804ccf Author: Translation commit bot Date: Mon Nov 11 17:22:35 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties --- eu/securitylevel.properties | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eu/securitylevel.properties b/eu/securitylevel.properties index 0354feda2..0537475cd 100644 --- a/eu/securitylevel.properties +++ b/eu/securitylevel.properties @@ -5,18 +5,18 @@ securityLevel.standard.level = Estandarra securityLevel.standard.tooltip = Segurtasun maila : Estandarra securityLevel.standard.summary = Tor Nabigatzailearen eta web-orriaren ezaugarri guztiak gaituta daude. securityLevel.safer.level = Seguruagoa -securityLevel.safer.tooltip = Security Level : Safer +securityLevel.safer.tooltip = Segurtasun maila : Seguruagoa securityLevel.safer.summary = Askotan arriskutsuak diren webguneen ezaugarriak ezgaitzen ditu, gune batzuen funtzionalitatea galduz. securityLevel.safer.description1 = JavaScript ezgaituta dago HTTPS ez diren web-orrietan. securityLevel.safer.description2 = Letra-mota eta ikur matematiko batzuk ezgaituta daude. securityLevel.safer.description3 = Audioa eta bideoa (HTML5 media), eta WebGL erreproduzitzeko klikatu behar da. securityLevel.safest.level = Seguruena -securityLevel.safest.tooltip = Security Level : Safest +securityLevel.safest.tooltip = Segurtasun maila : Seguruena securityLevel.safest.summary = Gune estatikoek eta zerbitzuek behar dituzten ezaugarriak onartzen ditu soilik. Aldaketak hauek irudiei, mediari, eta scritpei eragiten diete. securityLevel.safest.description1 = JavaScripta ezgaituta dago gune guztietan. securityLevel.safest.description2 = Letra-mota, ikono, ikur matematiko batzuk eta irudiak ezgaituta daude. -securityLevel.safest.description3 = Audio and video (HTML5 media) are click-to-play. +securityLevel.safest.description3 = Soinua eta bideoa (HTML5 multimedia) erreproduzitzeko klikatu behar da. securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. securityLevel.learnMore = Gehiago jakin securityLevel.restoreDefaults = Lehenetsiak berrezarri -securityLevel.advancedSecuritySettings = Advanced Security Settings⦠+securityLevel.advancedSecuritySettings = Segurtasun ezarpen aurreratuak⦠___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd_completed
commit 6247914956f4e1776bc40ed5cf5fe1b48027cb67 Author: Translation commit bot Date: Mon Nov 11 17:21:55 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd_completed --- eu/torbutton.dtd | 88 ++-- 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/eu/torbutton.dtd b/eu/torbutton.dtd index 66632851e..3bde313f5 100644 --- a/eu/torbutton.dtd +++ b/eu/torbutton.dtd @@ -1,41 +1,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
commit aec818f21e0fb4d13ba8694f3518977216cbd923 Author: Translation commit bot Date: Mon Nov 11 17:21:48 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd --- eu/torbutton.dtd | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eu/torbutton.dtd b/eu/torbutton.dtd index 9a1adb7bd..0f1ad7c89 100644 --- a/eu/torbutton.dtd +++ b/eu/torbutton.dtd @@ -39,11 +39,11 @@ - - - + + + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] test/parseconf: Add basic parsing tests
commit 2d651f4f6ad864541473f2371ed314352479ce7a Author: teor Date: Mon Nov 11 13:04:28 2019 +1000 test/parseconf: Add basic parsing tests And document the "%include" behaviour. Closes 32450. --- src/test/conf_examples/empty_1/expected | 0 src/test/conf_examples/empty_1/torrc | 0 src/test/conf_examples/empty_2/cmdline| 0 src/test/conf_examples/empty_2/expected | 0 src/test/conf_examples/empty_2/torrc | 0 src/test/conf_examples/empty_2/torrc.defaults | 0 src/test/conf_examples/empty_3/expected | 0 src/test/conf_examples/empty_3/included/empty | 0 src/test/conf_examples/empty_3/torrc | 1 + src/test/conf_examples/empty_4/error | 1 + src/test/test_parseconf.sh| 5 + 11 files changed, 7 insertions(+) diff --git a/src/test/conf_examples/empty_1/expected b/src/test/conf_examples/empty_1/expected new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/empty_1/torrc b/src/test/conf_examples/empty_1/torrc new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/empty_2/cmdline b/src/test/conf_examples/empty_2/cmdline new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/empty_2/expected b/src/test/conf_examples/empty_2/expected new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/empty_2/torrc b/src/test/conf_examples/empty_2/torrc new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/empty_2/torrc.defaults b/src/test/conf_examples/empty_2/torrc.defaults new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/empty_3/expected b/src/test/conf_examples/empty_3/expected new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/empty_3/included/empty b/src/test/conf_examples/empty_3/included/empty new file mode 100644 index 0..e69de29bb diff --git a/src/test/conf_examples/empty_3/torrc b/src/test/conf_examples/empty_3/torrc new file mode 100644 index 0..049b43890 --- /dev/null +++ b/src/test/conf_examples/empty_3/torrc @@ -0,0 +1 @@ +%include "included" diff --git a/src/test/conf_examples/empty_4/error b/src/test/conf_examples/empty_4/error new file mode 100644 index 0..e6c2f7d88 --- /dev/null +++ b/src/test/conf_examples/empty_4/error @@ -0,0 +1 @@ +Unable to open configuration file \ No newline at end of file diff --git a/src/test/test_parseconf.sh b/src/test/test_parseconf.sh index 85a23a6a3..8d41438b2 100755 --- a/src/test/test_parseconf.sh +++ b/src/test/test_parseconf.sh @@ -28,6 +28,11 @@ # cmdline -- Optional. If present, it contains command-line arguments that # will be passed to Tor. # +# (included torrc files or directories) -- Optional. If present, and +# configured in the torrc* or cmdline, these files or directories are +# included. Include paths should be specified relative to the test case +# directory. +# # expected -- If this file is present, then it should be the expected result # of "--dump-config short" for this test case. Exactly one of # "expected" or "error" must be present, or the test will fail. ___ 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 'tor-github/pr/1524'
commit 01af3a55f41de991c0b59d5bf12c100c82829b47 Merge: 4462766d3 2d651f4f6 Author: Nick Mathewson Date: Mon Nov 11 11:57:31 2019 -0500 Merge remote-tracking branch 'tor-github/pr/1524' src/test/conf_examples/empty_1/expected | 0 src/test/conf_examples/empty_1/torrc | 0 src/test/conf_examples/empty_2/cmdline| 0 src/test/conf_examples/empty_2/expected | 0 src/test/conf_examples/empty_2/torrc | 0 src/test/conf_examples/empty_2/torrc.defaults | 0 src/test/conf_examples/empty_3/expected | 0 src/test/conf_examples/empty_3/included/empty | 0 src/test/conf_examples/empty_3/torrc | 1 + src/test/conf_examples/empty_4/error | 1 + src/test/test_parseconf.sh| 5 + 11 files changed, 7 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 'ticket32404'
commit 4462766d32eb3ee4505e300b116dcb7493bf3b0b Merge: 2b3dc3384 9d562bba4 Author: Nick Mathewson Date: Mon Nov 11 11:54:14 2019 -0500 Merge branch 'ticket32404' changes/ticket32404 | 5 + src/lib/conf/confdecl.h | 1 + src/lib/conf/conftypes.h| 21 +++-- src/lib/confmgt/confmgt.c | 5 + src/lib/confmgt/type_defs.c | 15 +++ 5 files changed, 37 insertions(+), 10 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Refactor "OBSOLETE" type
commit a08969e460af2834c037761e96e2c1e9fedf5b14
Author: Nick Mathewson
Date: Thu Nov 7 09:25:56 2019 -0500
Refactor "OBSOLETE" type
It no longer warns, and is now defined in terms of an "IGNORE" type.
(The "IGNORE" type is the same as "OBSOLETE", except that it is not
reported as obsolete. It should be useful for disabled modules.)
Closes ticket 32404.
---
changes/ticket32404 | 5 +
src/lib/conf/confdecl.h | 1 +
src/lib/conf/conftypes.h| 3 ++-
src/lib/confmgt/type_defs.c | 15 +++
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/changes/ticket32404 b/changes/ticket32404
new file mode 100644
index 0..1bffbc652
--- /dev/null
+++ b/changes/ticket32404
@@ -0,0 +1,5 @@
+ o Minor features (configuration):
+- We use a flag-driven logic to warn about obsolete configuration fields,
+ so that we can include their names. In 0.4.2, we used
+ a special type, which prevented us from generating good warnings.
+ Implements ticket 32404.
diff --git a/src/lib/conf/confdecl.h b/src/lib/conf/confdecl.h
index 19b6f8509..e16515575 100644
--- a/src/lib/conf/confdecl.h
+++ b/src/lib/conf/confdecl.h
@@ -191,6 +191,7 @@ extern const struct var_type_def_t CSV_INTERVAL_type_defn;
extern const struct var_type_def_t LINELIST_type_defn;
extern const struct var_type_def_t LINELIST_V_type_defn;
extern const struct var_type_def_t LINELIST_S_type_defn;
+extern const struct var_type_def_t IGNORE_type_defn;
extern const struct var_type_def_t OBSOLETE_type_defn;
/**@}*/
diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h
index bf748efbb..ea1c8d476 100644
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@ -64,7 +64,8 @@ typedef enum config_type_t {
CONFIG_TYPE_LINELIST_V, /**< Catch-all "virtual" option to summarize
* context-sensitive config lines when fetching.
*/
- CONFIG_TYPE_OBSOLETE, /**< Obsolete (ignored) option. */
+ CONFIG_TYPE_OBSOLETE, /**< Ignored (obsolete) option. Uses no storage. */
+ CONFIG_TYPE_IGNORE, /**< Ignored option. Uses no storage. */
/**
* Extended type: definition appears in the type_def pointer
* of the corresponding struct_member_t.
diff --git a/src/lib/confmgt/type_defs.c b/src/lib/confmgt/type_defs.c
index 0bf82ee93..7200218f7 100644
--- a/src/lib/confmgt/type_defs.c
+++ b/src/lib/confmgt/type_defs.c
@@ -682,17 +682,13 @@ static const var_type_fns_t linelist_s_fns = {
/
// CONFIG_TYPE_ROUTERSET
//
-// This type is not implemented here, since routerset_t is not available
// to this module.
/
/
-// CONFIG_TYPE_OBSOLETE
+// CONFIG_TYPE_IGNORE
//
-// Used to indicate an obsolete option.
-//
-// This is not a type, and should be handled at a higher level of
-// abstraction.
+// Used to indicate an option that cannot be stored or encoded.
/
static int
@@ -703,8 +699,6 @@ ignore_parse(void *target, const char *value, char **errmsg,
(void)value;
(void)errmsg;
(void)params;
- // move this to a higher level, once such a level exists.
- log_warn(LD_GENERAL, "Skipping obsolete configuration option.");
return 0;
}
@@ -774,6 +768,10 @@ const var_type_def_t LINELIST_S_type_defn = {
const var_type_def_t LINELIST_V_type_defn = {
.name="Virtual", .fns=_v_fns,
.flags=CFLG_NOREPLACE|CFLG_NOSET };
+const var_type_def_t IGNORE_type_defn = {
+ .name="Ignored", .fns=_fns,
+ .flags=CFLG_NOCOPY|CFLG_NOCMP|CFLG_NODUMP|CFLG_NOSET,
+};
const var_type_def_t OBSOLETE_type_defn = {
.name="Obsolete", .fns=_fns,
.flags=CFLG_GROUP_OBSOLETE,
@@ -800,6 +798,7 @@ static const var_type_def_t *type_definitions_table[] = {
[CONFIG_TYPE_LINELIST] = _type_defn,
[CONFIG_TYPE_LINELIST_S] = _S_type_defn,
[CONFIG_TYPE_LINELIST_V] = _V_type_defn,
+ [CONFIG_TYPE_IGNORE] = _type_defn,
[CONFIG_TYPE_OBSOLETE] = _type_defn,
};
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] New configuration flag to warn that a variable is obsolete.
commit 36af84ba5062b26d2ede647627e87f6ae74796cf
Author: Nick Mathewson
Date: Thu Nov 7 09:14:44 2019 -0500
New configuration flag to warn that a variable is obsolete.
Part of 32404.
---
src/lib/conf/conftypes.h | 8 +++-
src/lib/confmgt/confmgt.c | 5 +
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h
index dfe51cfba..bf748efbb 100644
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@ -183,12 +183,18 @@ typedef struct struct_magic_decl_t {
* running.
**/
#define CFLG_IMMUTABLE (1u<<6)
+/**
+ * Flag to indicate that we should warn that an option or type is obsolete
+ * whenever the user tries to use it.
+ **/
+#define CFLG_WARN_OBSOLETE (1u<<7)
/**
* A group of flags that should be set on all obsolete options and types.
**/
#define CFLG_GROUP_OBSOLETE \
- (CFLG_NOCOPY|CFLG_NOCMP|CFLG_NODUMP|CFLG_NOSET|CFLG_NOLIST)
+ (CFLG_NOCOPY|CFLG_NOCMP|CFLG_NODUMP|CFLG_NOSET|CFLG_NOLIST|\
+ CFLG_WARN_OBSOLETE)
/** A variable allowed in the configuration file or on the command line. */
typedef struct config_var_t {
diff --git a/src/lib/confmgt/confmgt.c b/src/lib/confmgt/confmgt.c
index a96c7f96b..c72efa847 100644
--- a/src/lib/confmgt/confmgt.c
+++ b/src/lib/confmgt/confmgt.c
@@ -657,6 +657,11 @@ config_assign_value(const config_mgr_t *mgr, void *options,
tor_assert(!strcmp(c->key, var->cvar->member.name));
void *object = config_mgr_get_obj_mutable(mgr, options, var->object_idx);
+ if (config_var_has_flag(var->cvar, CFLG_WARN_OBSOLETE)) {
+log_warn(LD_GENERAL, "Skipping obsolete configuration option \"%s\".",
+ var->cvar->member.name);
+ }
+
return struct_var_kvassign(object, c, msg, >cvar->member);
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] clarify OBSOLETE vs IGNORE.
commit 9d562bba40d1e56ba459467611c815ab8d27f27e
Author: Nick Mathewson
Date: Mon Nov 11 11:54:02 2019 -0500
clarify OBSOLETE vs IGNORE.
---
src/lib/conf/conftypes.h | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h
index ea1c8d476..19ea99731 100644
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@ -64,8 +64,18 @@ typedef enum config_type_t {
CONFIG_TYPE_LINELIST_V, /**< Catch-all "virtual" option to summarize
* context-sensitive config lines when fetching.
*/
- CONFIG_TYPE_OBSOLETE, /**< Ignored (obsolete) option. Uses no storage. */
- CONFIG_TYPE_IGNORE, /**< Ignored option. Uses no storage. */
+ /** Ignored (obsolete) option. Uses no storage.
+ *
+ * Reported as "obsolete" when its type is queried.
+ */
+ CONFIG_TYPE_OBSOLETE,
+ /** Ignored option. Uses no storage.
+ *
+ * Reported as "ignored" when its type is queried. For use with options used
+ * by disabled modules.
+ **/
+ CONFIG_TYPE_IGNORE,
+
/**
* Extended type: definition appears in the type_def pointer
* of the corresponding struct_member_t.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit b92e56d41b09b7e5cb93d9fec1368df1811f0f75 Author: Translation commit bot Date: Mon Nov 11 16:53:49 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+it.po | 48 +--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/contents+it.po b/contents+it.po index ad5713f89..542a4b458 100644 --- a/contents+it.po +++ b/contents+it.po @@ -5856,6 +5856,10 @@ msgid "" "specifies what sort of outbound connections are allowed or refused from that" " relay." msgstr "" +"* Ogni relè Tor ha una [politica di " +"uscita](https://2019.www.torproject.org/docs/faq.html.en#ExitPolicies) che " +"specifica quale tipo di connessioni in uscita sono consentite o rifiutate da" +" quel relè." #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.description) @@ -5863,6 +5867,9 @@ msgid "" "If you are uncomfortable allowing people to exit from your relay, you can " "set it up to only allow connections to other Tor relays." msgstr "" +"Se non ti senti a tuo agio nel consentire alle persone di uscire dal tuo " +"relè, puoi impostarlo in modo da consentire solo le connessioni ad altri " +"relè Tor." #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.description) @@ -5871,11 +5878,15 @@ msgid "" "capacity, so high-bandwidth relays will attract more users than low-" "bandwidth ones. Therefore, having low-bandwidth relays is useful too." msgstr "" +"* Il tuo relè stimerà e pubblicizzerà passivamente la sua recente capacità " +"di banda, quindi i relè ad alta larghezza di banda attireranno più utenti di" +" quelli a bassa larghezza di banda. Pertanto, anche avere relè a larghezza " +"di banda ridotta è utile." #: https//support.torproject.org/operators/relay-memory/ #: (content/operators/relay-memory/contents+en.lrquestion.title) msgid "Why is my Tor relay using so much memory?" -msgstr "" +msgstr "Perché il mio relè Tor utilizza così tanta memoria?" #: https//support.torproject.org/operators/relay-memory/ #: (content/operators/relay-memory/contents+en.lrquestion.description) @@ -5883,6 +5894,8 @@ msgid "" "If your Tor relay is using more memory than you'd like, here are some tips " "for reducing its footprint:" msgstr "" +"Se il tuo relè Tor sta utilizzando più memoria di quella che desideri, ecco " +"alcuni suggerimenti per ridurne l'impatto:" #: https//support.torproject.org/operators/relay-memory/ #: (content/operators/relay-memory/contents+en.lrquestion.description) @@ -5890,6 +5903,8 @@ msgid "" "* If you're on Linux, you may be encountering memory fragmentation bugs in " "glibc's malloc implementation." msgstr "" +"* Se sei su Linux, potresti riscontrare bug di frammentazione della memoria " +"nell'implementazione malloc di glibc." #: https//support.torproject.org/operators/relay-memory/ #: (content/operators/relay-memory/contents+en.lrquestion.description) @@ -5897,6 +5912,8 @@ msgid "" "That is, when Tor releases memory back to the system, the pieces of memory " "are fragmented so they're hard to reuse." msgstr "" +"Cioè, quando Tor rilascia memoria nel sistema, i frammenti di memoria sono " +"frammentati e quindi più difficili da riutilizzare." #: https//support.torproject.org/operators/relay-memory/ #: (content/operators/relay-memory/contents+en.lrquestion.description) @@ -5904,6 +5921,9 @@ msgid "" "The Tor tarball ships with OpenBSD's malloc implementation, which doesn't " "have as many fragmentation bugs (but the tradeoff is higher CPU load)." msgstr "" +"Il tarball Tor viene fornito con l'implementazione malloc di OpenBSD, che " +"non ha altrettanti bug di frammentazione (ma il compromesso è un carico " +"maggiore della CPU)." #: https//support.torproject.org/operators/relay-memory/ #: (content/operators/relay-memory/contents+en.lrquestion.description) @@ -5911,6 +5931,8 @@ msgid "" "You can tell Tor to use this malloc implementation instead: `./configure " "--enable-openbsd-malloc`." msgstr "" +"Puoi dire a Tor di utilizzare questa implementazione di malloc al suo posto:" +" `./configure --enable-openbsd-malloc`." #: https//support.torproject.org/operators/relay-memory/ #: (content/operators/relay-memory/contents+en.lrquestion.description) @@ -5919,6 +5941,9 @@ msgid "" "open, you are probably losing a lot of memory to OpenSSL's internal buffers " "(38KB+ per socket)." msgstr "" +"* Se stai eseguendo un relè veloce, il che significa che hai molte " +"connessioni TLS aperte, probabilmente stai perdendo molta memoria nei buffer" +" interni di OpenSSL (38 KB+ per socket)." #: https//support.torproject.org/operators/relay-memory/ #: (content/operators/relay-memory/contents+en.lrquestion.description) @@ -5927,6 +5952,9 @@ msgid "" "aggressively](https://lists.torproject.org/pipermail/tor-;
[tor-commits] [translation/torbutton-securitylevelproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties
commit bbe91a43e0e8eba98d19b36e3a78c769c64cdf66 Author: Translation commit bot Date: Mon Nov 11 16:52:23 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties --- eu/securitylevel.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu/securitylevel.properties b/eu/securitylevel.properties index 08ea80dcd..0354feda2 100644 --- a/eu/securitylevel.properties +++ b/eu/securitylevel.properties @@ -2,7 +2,7 @@ securityLevel.securityLevel = Segurtasun maila securityLevel.customWarning = Pertsonalizatua securityLevel.overview = Disable certain web features that can be used to attack your security and anonymity. securityLevel.standard.level = Estandarra -securityLevel.standard.tooltip = Security Level : Standard +securityLevel.standard.tooltip = Segurtasun maila : Estandarra securityLevel.standard.summary = Tor Nabigatzailearen eta web-orriaren ezaugarri guztiak gaituta daude. securityLevel.safer.level = Seguruagoa securityLevel.safer.tooltip = Security Level : Safer ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update lego
commit 5861bc1ad8201f9b8b04451415727c5cf372d9e5
Author: hiro
Date: Mon Nov 11 17:06:42 2019 +0100
Update lego
---
databags/about+bn-BD.ini | 1 -
databags/about+de.ini| 1 -
databags/about+es.ini| 1 -
databags/about+fr.ini| 1 -
databags/about+id.ini| 1 -
databags/about+is.ini| 1 -
databags/about+it.ini| 1 -
databags/about+ka.ini| 1 -
databags/about+ko.ini| 1 -
databags/about+pt-BR.ini | 1 -
databags/about+ru.ini| 1 -
databags/about+tr.ini| 1 -
databags/about+zh-CN.ini | 1 -
databags/{about+en.ini => about.ini} | 1 +
databags/links.ini | 1 +
databags/menu+bn-BD.ini | 1 -
databags/menu+de.ini | 1 -
databags/menu+en.ini | 1 -
databags/menu+es.ini | 1 -
databags/menu+fr.ini | 1 -
databags/menu+id.ini | 1 -
databags/menu+is.ini | 1 -
databags/menu+it.ini | 1 -
databags/menu+ka.ini | 1 -
databags/menu+ko.ini | 1 -
databags/menu+pt-BR.ini | 1 -
databags/menu+ru.ini | 1 -
databags/menu+tr.ini | 1 -
databags/menu+zh-CN.ini | 1 -
databags/menu.ini| 1 +
databags/menu_footer+bn-BD.ini | 1 -
databags/menu_footer+de.ini | 1 -
databags/menu_footer+en.ini | 1 -
databags/menu_footer+es.ini | 1 -
databags/menu_footer+fr.ini | 1 -
databags/menu_footer+id.ini | 1 -
databags/menu_footer+is.ini | 1 -
databags/menu_footer+it.ini | 1 -
databags/menu_footer+ka.ini | 1 -
databags/menu_footer+ko.ini | 1 -
databags/menu_footer+pt-BR.ini | 1 -
databags/menu_footer+ru.ini | 1 -
databags/menu_footer+tr.ini | 1 -
databags/menu_footer+zh-CN.ini | 1 -
databags/menu_footer.ini | 1 +
lego | 2 +-
46 files changed, 5 insertions(+), 42 deletions(-)
diff --git a/databags/about+bn-BD.ini b/databags/about+bn-BD.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+bn-BD.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+de.ini b/databags/about+de.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+de.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+es.ini b/databags/about+es.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+es.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+fr.ini b/databags/about+fr.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+fr.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+id.ini b/databags/about+id.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+id.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+is.ini b/databags/about+is.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+is.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+it.ini b/databags/about+it.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+it.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+ka.ini b/databags/about+ka.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+ka.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+ko.ini b/databags/about+ko.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+ko.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+pt-BR.ini b/databags/about+pt-BR.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+pt-BR.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+ru.ini b/databags/about+ru.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+ru.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+tr.ini b/databags/about+tr.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+tr.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+zh-CN.ini b/databags/about+zh-CN.ini
deleted file mode 12
index 234b948..000
--- a/databags/about+zh-CN.ini
+++ /dev/null
@@ -1 +0,0 @@
-about+en.ini
\ No newline at end of file
diff --git a/databags/about+en.ini b/databags/about.ini
similarity index 99%
rename from
[tor-commits] [styleguide/master] Update lego
commit 42a4a19a1ff88ee4e8f0b5319ee773d9e5e764ef Author: hiro Date: Mon Nov 11 17:10:11 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 924e3db..6a550fa 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 924e3dbdec864fa02075515a48f915dc811ec12b +Subproject commit 6a550faea39a534af47923a01bd29d138365819f ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [styleguide/master] Update lego and reduce menu databags
commit 743f485211bdca7d04142a0a8ecc2a63e8f8bcb0 Author: hiro Date: Mon Nov 11 16:59:15 2019 +0100 Update lego and reduce menu databags --- databags/links.ini | 1 + databags/menu+en.ini| 1 - databags/menu.ini | 16 +--- databags/menu_footer+en.ini | 1 - databags/menu_footer.ini| 1 + lego| 2 +- 6 files changed, 4 insertions(+), 18 deletions(-) diff --git a/databags/links.ini b/databags/links.ini new file mode 12 index 000..fa8bbfe --- /dev/null +++ b/databags/links.ini @@ -0,0 +1 @@ +../lego/databags/links.ini \ No newline at end of file diff --git a/databags/menu+en.ini b/databags/menu+en.ini deleted file mode 12 index 1fa7edf..000 --- a/databags/menu+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+en.ini \ No newline at end of file diff --git a/databags/menu.ini b/databags/menu.ini deleted file mode 100644 index 3a8eb2a..000 --- a/databags/menu.ini +++ /dev/null @@ -1,15 +0,0 @@ -[About] -path = / -label = About - -[Getting Started] -path = /getting-started -label = Getting Started - -[Visuals] -path = /visuals -label = Visuals - -[Components] -path = /components -label = Components diff --git a/databags/menu.ini b/databags/menu.ini new file mode 12 index 000..94f62ff --- /dev/null +++ b/databags/menu.ini @@ -0,0 +1 @@ +../lego/databags/menu.ini \ No newline at end of file diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini deleted file mode 12 index d14a20f..000 --- a/databags/menu_footer+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini new file mode 12 index 000..e6c1f3b --- /dev/null +++ b/databags/menu_footer.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer.ini \ No newline at end of file diff --git a/lego b/lego index ae51128..924e3db 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40 +Subproject commit 924e3dbdec864fa02075515a48f915dc811ec12b ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [gettor-web/master] Update lego
commit d56b8f91f69812600f01992b416aca431b61834c Author: hiro Date: Mon Nov 11 17:09:49 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 924e3db..6a550fa 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 924e3dbdec864fa02075515a48f915dc811ec12b +Subproject commit 6a550faea39a534af47923a01bd29d138365819f ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Update lego
commit 09fcf6a2a18d364c1b32d50d7ecd33fd69433702 Author: hiro Date: Mon Nov 11 17:10:04 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 924e3db..6a550fa 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 924e3dbdec864fa02075515a48f915dc811ec12b +Subproject commit 6a550faea39a534af47923a01bd29d138365819f ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [dev/master] Update lego
commit 1fc67160a9e60c2d88c4d6917d2b3c7da4e42f4d Author: hiro Date: Mon Nov 11 17:09:44 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index ae51128..6a550fa 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40 +Subproject commit 6a550faea39a534af47923a01bd29d138365819f ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [community/master] Remove unused menu and update template
commit a5f03cebf373c48b3dd7516babce036adf31
Author: hiro
Date: Mon Nov 11 17:09:11 2019 +0100
Remove unused menu and update template
---
databags/menu+bn-BD.ini | 1 -
databags/menu+de.ini | 1 -
databags/menu+en.ini | 1 -
databags/menu+es.ini | 1 -
databags/menu+fr.ini | 1 -
databags/menu+id.ini | 1 -
databags/menu+is.ini | 1 -
databags/menu+it.ini | 1 -
databags/menu+ka.ini | 1 -
databags/menu+ko.ini | 1 -
databags/menu+pt-BR.ini | 1 -
databags/menu+ru.ini | 1 -
databags/menu+tr.ini | 1 -
databags/menu+zh-CN.ini | 1 -
databags/menu_footer+bn-BD.ini | 1 -
databags/menu_footer+de.ini | 1 -
databags/menu_footer+en.ini | 1 -
databags/menu_footer+es.ini | 1 -
databags/menu_footer+fr.ini | 1 -
databags/menu_footer+id.ini | 1 -
databags/menu_footer+is.ini | 1 -
databags/menu_footer+it.ini | 1 -
databags/menu_footer+ka.ini | 1 -
databags/menu_footer+ko.ini | 1 -
databags/menu_footer+pt-BR.ini | 1 -
databags/menu_footer+ru.ini | 1 -
databags/menu_footer+tr.ini | 1 -
databags/menu_footer+zh-CN.ini | 1 -
databags/pagenav+de.ini | 1 -
databags/pagenav+es.ini | 1 -
databags/pagenav+fr.ini | 1 -
databags/pagenav+it.ini | 1 -
databags/pagenav+pt-BR.ini | 1 -
databags/pagenav+ru.ini | 1 -
databags/{pagenav+en.ini => pagenav.ini} | 0
lego | 2 +-
templates/pagenav.html | 2 +-
37 files changed, 2 insertions(+), 36 deletions(-)
diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini
deleted file mode 12
index c9b2dc8..000
--- a/databags/menu+bn-BD.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+bn-BD.ini
\ No newline at end of file
diff --git a/databags/menu+de.ini b/databags/menu+de.ini
deleted file mode 12
index 6bb02de..000
--- a/databags/menu+de.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+de.ini
\ No newline at end of file
diff --git a/databags/menu+en.ini b/databags/menu+en.ini
deleted file mode 12
index 1fa7edf..000
--- a/databags/menu+en.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+en.ini
\ No newline at end of file
diff --git a/databags/menu+es.ini b/databags/menu+es.ini
deleted file mode 12
index fd8def3..000
--- a/databags/menu+es.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+es.ini
\ No newline at end of file
diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini
deleted file mode 12
index 5366289..000
--- a/databags/menu+fr.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+fr.ini
\ No newline at end of file
diff --git a/databags/menu+id.ini b/databags/menu+id.ini
deleted file mode 12
index 7c2858b..000
--- a/databags/menu+id.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+id.ini
\ No newline at end of file
diff --git a/databags/menu+is.ini b/databags/menu+is.ini
deleted file mode 12
index b02aed7..000
--- a/databags/menu+is.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+is.ini
\ No newline at end of file
diff --git a/databags/menu+it.ini b/databags/menu+it.ini
deleted file mode 12
index fcdde73..000
--- a/databags/menu+it.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+it.ini
\ No newline at end of file
diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini
deleted file mode 12
index 336d4ad..000
--- a/databags/menu+ka.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+ka.ini
\ No newline at end of file
diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini
deleted file mode 12
index 31e262b..000
--- a/databags/menu+ko.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+ko.ini
\ No newline at end of file
diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini
deleted file mode 12
index fd27afb..000
--- a/databags/menu+pt-BR.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+pt-BR.ini
\ No newline at end of file
diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini
deleted file mode 12
index 6f30a3e..000
--- a/databags/menu+ru.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+ru.ini
\ No newline at end of file
diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini
deleted file mode 12
index 8a01592..000
--- a/databags/menu+tr.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+tr.ini
\ No newline at end of file
diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini
deleted file mode 12
index 425a6f8..000
--- a/databags/menu+zh-CN.ini
+++ /dev/null
@@ -1
[tor-commits] [gettor-web/master] Update lego and menus
commit 68479946e58882a1911d72aa7195c763aef66b8b Author: hiro Date: Mon Nov 11 16:47:40 2019 +0100 Update lego and menus --- databags/links.ini | 1 + databags/menu+en.ini| 1 - databags/menu.ini | 1 + databags/menu_footer+en.ini | 1 - databags/menu_footer.ini| 1 + lego| 2 +- 6 files changed, 4 insertions(+), 3 deletions(-) diff --git a/databags/links.ini b/databags/links.ini new file mode 12 index 000..fa8bbfe --- /dev/null +++ b/databags/links.ini @@ -0,0 +1 @@ +../lego/databags/links.ini \ No newline at end of file diff --git a/databags/menu+en.ini b/databags/menu+en.ini deleted file mode 12 index 1fa7edf..000 --- a/databags/menu+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+en.ini \ No newline at end of file diff --git a/databags/menu.ini b/databags/menu.ini new file mode 12 index 000..94f62ff --- /dev/null +++ b/databags/menu.ini @@ -0,0 +1 @@ +../lego/databags/menu.ini \ No newline at end of file diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini deleted file mode 12 index d14a20f..000 --- a/databags/menu_footer+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini new file mode 12 index 000..e6c1f3b --- /dev/null +++ b/databags/menu_footer.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer.ini \ No newline at end of file diff --git a/lego b/lego index ae51128..924e3db 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40 +Subproject commit 924e3dbdec864fa02075515a48f915dc811ec12b ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Update lego and reduce menu databags
commit fc94c675364df38b54373d47cb5d7d1f32a6699b Author: hiro Date: Mon Nov 11 16:57:41 2019 +0100 Update lego and reduce menu databags --- databags/links.ini | 1 + databags/menu+en.ini| 1 - databags/menu.ini | 1 + databags/menu_footer+en.ini | 1 - databags/menu_footer.ini| 1 + lego| 2 +- 6 files changed, 4 insertions(+), 3 deletions(-) diff --git a/databags/links.ini b/databags/links.ini new file mode 12 index 000..fa8bbfe --- /dev/null +++ b/databags/links.ini @@ -0,0 +1 @@ +../lego/databags/links.ini \ No newline at end of file diff --git a/databags/menu+en.ini b/databags/menu+en.ini deleted file mode 12 index 1fa7edf..000 --- a/databags/menu+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+en.ini \ No newline at end of file diff --git a/databags/menu.ini b/databags/menu.ini new file mode 12 index 000..94f62ff --- /dev/null +++ b/databags/menu.ini @@ -0,0 +1 @@ +../lego/databags/menu.ini \ No newline at end of file diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini deleted file mode 12 index d14a20f..000 --- a/databags/menu_footer+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini new file mode 12 index 000..e6c1f3b --- /dev/null +++ b/databags/menu_footer.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer.ini \ No newline at end of file diff --git a/lego b/lego index ae51128..924e3db 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40 +Subproject commit 924e3dbdec864fa02075515a48f915dc811ec12b ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Remove links to menus
commit 6a550faea39a534af47923a01bd29d138365819f Author: hiro Date: Mon Nov 11 17:06:23 2019 +0100 Remove links to menus --- databags/menu+bn-BD.ini| 23 --- databags/menu+ca.ini | 23 --- databags/menu+de.ini | 23 --- databags/menu+en.ini | 23 --- databags/menu+es.ini | 23 --- databags/menu+fr.ini | 23 --- databags/menu+id.ini | 23 --- databags/menu+is.ini | 23 --- databags/menu+it.ini | 23 --- databags/menu+ka.ini | 23 --- databags/menu+ko.ini | 23 --- databags/menu+pt-BR.ini| 23 --- databags/menu+ru.ini | 23 --- databags/menu+tr.ini | 23 --- databags/menu+zh-CN.ini| 23 --- databags/menu_footer+ar.ini| 15 --- databags/menu_footer+bn-BD.ini | 1 - databags/menu_footer+ca.ini| 1 - databags/menu_footer+de.ini| 1 - databags/menu_footer+en.ini| 15 --- databags/menu_footer+es.ini| 15 --- databags/menu_footer+fr.ini| 1 - databags/menu_footer+id.ini| 1 - databags/menu_footer+is.ini| 1 - databags/menu_footer+it.ini| 1 - databags/menu_footer+ka.ini| 1 - databags/menu_footer+ko.ini| 1 - databags/menu_footer+pt-BR.ini | 1 - databags/menu_footer+ru.ini| 1 - databags/menu_footer+tr.ini| 1 - databags/menu_footer+zh-CN.ini | 1 - 31 files changed, 403 deletions(-) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini deleted file mode 100644 index 1213a2c..000 --- a/databags/menu+bn-BD.ini +++ /dev/null @@ -1,23 +0,0 @@ -[about] -path = https://www.torproject.org/bn-BD/about/history -label = à¦à¦¤à¦¿à¦¹à¦¾à¦¸ - -[documentation] -path = https://2019.www.torproject.org/docs/documentation.html.en -label = ডà¦à§à¦®à§à¦¨à§à¦à§à¦¶à¦¨ - -[support] -path = https://support.torproject.org/bn-BD/ -label = সমরà§à¦¥à¦¨ - -[community] -path = https://community.torproject.org/bn-BD/ -label = Community - -[blog] -path = https://blog.torproject.org -label = বà§à¦²à¦ - -[donate] -path = https://donate.torproject.org -label = ডনà§à¦ à¦à¦°à§à¦¨ diff --git a/databags/menu+ca.ini b/databags/menu+ca.ini deleted file mode 100644 index b69f599..000 --- a/databags/menu+ca.ini +++ /dev/null @@ -1,23 +0,0 @@ -[about] -path = https://www.torproject.org/ca/about/history -label = About - -[documentation] -path = https://2019.www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/ca/ -label = Support - -[community] -path = https://community.torproject.org/ -label = Community - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/ -label = Donate diff --git a/databags/menu+de.ini b/databags/menu+de.ini deleted file mode 100644 index 7e2d2e8..000 --- a/databags/menu+de.ini +++ /dev/null @@ -1,23 +0,0 @@ -[about] -path = https://www.torproject.org/de/about/history -label = About - -[documentation] -path = https://2019.www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/de/ -label = Support - -[community] -path = https://community.torproject.org/ -label = Community - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/de/ -label = Donate diff --git a/databags/menu+en.ini b/databags/menu+en.ini deleted file mode 100644 index e7a52b2..000 --- a/databags/menu+en.ini +++ /dev/null @@ -1,23 +0,0 @@ -[about] -path = https://www.torproject.org/about/history/ -label = About - -[documentation] -path = https://2019.www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/ -label = Support - -[community] -path = https://community.torproject.org/ -label = Community - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org -label = Donate diff --git a/databags/menu+es.ini b/databags/menu+es.ini deleted file mode 100644 index c12e51b..000 --- a/databags/menu+es.ini +++ /dev/null @@ -1,23 +0,0 @@ -[about] -path = https://www.torproject.org/es/about/history -label = About - -[documentation] -path = https://2019.www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/es/ -label = Support - -[community] -path = https://community.torproject.org/es/ -label = Community - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/es -label = Donate diff --git a/databags/menu+fr.ini
[tor-commits] [lego/master] Use only one about menu in tpo
commit c51ef99eba57a7481b12dfee061adbdf6ef9b2c8
Author: hiro
Date: Mon Nov 11 17:04:58 2019 +0100
Use only one about menu in tpo
---
templates/pagenav.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/pagenav.html b/templates/pagenav.html
index febbef1..8bc5c8f 100644
--- a/templates/pagenav.html
+++ b/templates/pagenav.html
@@ -2,7 +2,7 @@
-{% set menubag = this.section_id + '+' + this.alt %}
+{% set menubag = this.section_id %}
{% for id, item in bag(menubag).items() %}
{% set item_path = site.get(item.path) %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to templates
commit 924e3dbdec864fa02075515a48f915dc811ec12b
Author: hiro
Date: Mon Nov 11 16:42:06 2019 +0100
Update to templates
---
templates/footer.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/footer.html b/templates/footer.html
index d1681b7..897e736 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -38,9 +38,9 @@
{% else %}
{% endif %}
- {{ _(item.label) }}
+ {{ _(item.label) }}
{% if this.is_child_of(item.path) %}
- (current)
+(current)
{% endif %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to templates
commit 3c074913500500d4a0a9cada02adb25fd9f8b92b
Author: hiro
Date: Mon Nov 11 16:41:24 2019 +0100
Update to templates
---
templates/navbar.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/navbar.html b/templates/navbar.html
index a014de2..0210587 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -32,7 +32,7 @@
{% if link %}
{% else %}
- {% set link = bag('links', this.alt, item.label) %}
+ {% set link = bag('links', this.alt, id) %}
{% if link %}
{% else %}
___
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 'ticket32385'
commit 2b3dc3384c41a1e8961b9303b5fa533edf4922c3 Merge: ee33bf5ee b1083584c Author: Nick Mathewson Date: Mon Nov 11 10:38:10 2019 -0500 Merge branch 'ticket32385' Doxyfile.in | 4 ++-- changes/ticket32385 | 6 ++ configure.ac| 18 ++ 3 files changed, 26 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] Clarify that "missing-doc-warnings" makes doxygen warnings nonfatal
commit b1083584c752398056a591fb9b342f4e58e6b172 Author: Nick Mathewson Date: Wed Nov 6 16:59:41 2019 -0500 Clarify that "missing-doc-warnings" makes doxygen warnings nonfatal --- changes/ticket32385 | 3 ++- configure.ac| 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changes/ticket32385 b/changes/ticket32385 index 2a4fc64f3..2ff76be26 100644 --- a/changes/ticket32385 +++ b/changes/ticket32385 @@ -2,4 +2,5 @@ - Our "make doxygen" target now respects --enable-fatal-warnings by default, and does not warn about items that are missing documentation. To warn about missing documentation, run configure with the - "--enable-missing-doc-warnings" flag. Closes ticket 32385. + "--enable-missing-doc-warnings" flag: doing so suspends fatal warnings + for doxygen. Closes ticket 32385. diff --git a/configure.ac b/configure.ac index f3c955ad0..e8441411d 100644 --- a/configure.ac +++ b/configure.ac @@ -77,7 +77,7 @@ AC_ARG_ENABLE(pic, AS_HELP_STRING(--enable-pic, [Build Tor's binaries as position-independent code, suitable to link as a library.])) AC_ARG_ENABLE(missing-doc-warnings, - AS_HELP_STRING(--enable-missing-doc-warnings, [Tell doxygen to warn about missing documentation.])) + AS_HELP_STRING(--enable-missing-doc-warnings, [Tell doxygen to warn about missing documentation. Makes doxygen warnings nonfatal.])) if test "$enable_missing_doc_warnings" = "yes"; then DOXYGEN_FATAL_WARNINGS=NO ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Re-think our doxygen warnings wrt missing docs and fatalness.
commit d3e547b2bd93a5e43e90bda144971e243e092a57 Author: Nick Mathewson Date: Tue Nov 5 12:24:02 2019 -0500 Re-think our doxygen warnings wrt missing docs and fatalness. Up till now, we have warned about all missing documentation, which meant that we could never make doxygen warnings fatal. This has led to our doxygen output getting full of errors several times in the past. This commit changes our approach to doxygen warnings: missing documentation warnings are only on when the user asks for them with --enable-missing-doc-warnings. When that option is not present, doxygen respects the --enable-fatal-warnings flag. Closes ticket 32385. --- Doxyfile.in | 4 ++-- changes/ticket32385 | 5 + configure.ac| 18 ++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Doxyfile.in b/Doxyfile.in index be500bbfa..0f8b111d9 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -767,7 +767,7 @@ WARNINGS = YES # will automatically be disabled. # The default value is: YES. -WARN_IF_UNDOCUMENTED = YES +WARN_IF_UNDOCUMENTED = @DOXYGEN_WARN_ON_MISSING@ # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for # potential errors in the documentation, such as not documenting some parameters @@ -790,7 +790,7 @@ WARN_NO_PARAMDOC = NO # a warning is encountered. # The default value is: NO. -WARN_AS_ERROR = NO +WARN_AS_ERROR = @DOXYGEN_FATAL_WARNINGS@ # The WARN_FORMAT tag determines the format of the warning messages that doxygen # can produce. The string should contain the $file, $line, and $text tags, which diff --git a/changes/ticket32385 b/changes/ticket32385 new file mode 100644 index 0..2a4fc64f3 --- /dev/null +++ b/changes/ticket32385 @@ -0,0 +1,5 @@ + o Minor features (doxygen): +- Our "make doxygen" target now respects --enable-fatal-warnings by + default, and does not warn about items that are missing documentation. + To warn about missing documentation, run configure with the + "--enable-missing-doc-warnings" flag. Closes ticket 32385. diff --git a/configure.ac b/configure.ac index 487361773..f3c955ad0 100644 --- a/configure.ac +++ b/configure.ac @@ -76,6 +76,24 @@ AC_ARG_ENABLE(nss, AC_ARG_ENABLE(pic, AS_HELP_STRING(--enable-pic, [Build Tor's binaries as position-independent code, suitable to link as a library.])) +AC_ARG_ENABLE(missing-doc-warnings, + AS_HELP_STRING(--enable-missing-doc-warnings, [Tell doxygen to warn about missing documentation.])) + +if test "$enable_missing_doc_warnings" = "yes"; then + DOXYGEN_FATAL_WARNINGS=NO + DOXYGEN_WARN_ON_MISSING=YES +elif test "$enable_fatal_warnings" = "yes"; then + # Fatal warnings from doxygen are nice, but not if we're warning about + # missing documentation. + DOXYGEN_FATAL_WARNINGS=YES + DOXYGEN_WARN_ON_MISSING=NO +else + DOXYGEN_FATAL_WARNINGS=NO + DOXYGEN_WARN_ON_MISSING=NO +fi +AC_SUBST(DOXYGEN_FATAL_WARNINGS) +AC_SUBST(DOXYGEN_WARN_ON_MISSING) + if test "x$enable_coverage" != "xyes" -a "x$enable_asserts_in_tests" = "xno" ; then AC_MSG_ERROR([Can't disable assertions outside of coverage build]) fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update navbar with links databag
commit 7ad3e5bff416f501e05aaa54fdc742a6fb567159
Author: hiro
Date: Mon Nov 11 16:30:12 2019 +0100
Update navbar with links databag
---
databags/links.ini| 9 +
templates/navbar.html | 7 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/databags/links.ini b/databags/links.ini
new file mode 100644
index 000..b632ab1
--- /dev/null
+++ b/databags/links.ini
@@ -0,0 +1,9 @@
+[en]
+about = https://www.torproject.org/about/history/
+support = https://support.torproject.org
+donate = https://donate.torproject.org
+
+[ca]
+about = https://www.torproject.org/ca/about/history/
+support = https://support.torproject.org/ca
+donate = https://donate.torproject.org/
diff --git a/templates/navbar.html b/templates/navbar.html
index 64b5695..a014de2 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -32,7 +32,12 @@
{% if link %}
{% else %}
-
+ {% set link = bag('links', this.alt, item.label) %}
+ {% if link %}
+
+ {% else %}
+
+ {% endif %}
{% endif %}
{{ _(item.label) }}
{% if this.path == item.path %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Doxygen: close an unterminated .
commit ee33bf5ee0d1a2c88d185caa29e1924f919cc3e9 Author: Nick Mathewson Date: Mon Nov 11 10:23:41 2019 -0500 Doxygen: close an unterminated . --- src/lib/crypt_ops/crypto_openssl_mgt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index f028422ac..20c61696c 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -277,7 +277,7 @@ log_engine(const char *fn, ENGINE *e) /** Initialize engines for openssl (if enabled). Load all the built-in * engines, along with the one called accelName (which may be NULL). - * If accelName is prefixed with "!", then it is required: return -1 + * If accelName is prefixed with "!", then it is required: return -1 * if it can't be loaded. Otherwise return 0. * * If accelDir is not NULL, it is the path from which the engine should ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] doxygen: use and # to avoid interpreting # as a link.
commit ff930c3305958697053bf29465a6b8fba11d0281 Author: Nick Mathewson Date: Mon Nov 11 10:23:13 2019 -0500 doxygen: use and # to avoid interpreting # as a link. --- src/lib/conf/confdecl.h | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/conf/confdecl.h b/src/lib/conf/confdecl.h index 19b6f8509..695f9f307 100644 --- a/src/lib/conf/confdecl.h +++ b/src/lib/conf/confdecl.h @@ -40,10 +40,10 @@ * with appropriate members, and a table of config_var_t objects called * `module_options_t_vars[]`. * - * For lower-level modules, you can say `#define CONF_TABLE LL_TABLE`, and get - * a table definition suitable for use in modules that are at a lower level - * than lib/confmgt. Note that the types for these tables cannot include any - * extended types. + * For lower-level modules, you can say \#define CONF_TABLE LL_TABLE, + * and get a table definition suitable for use in modules that are at a lower + * level than lib/confmgt. Note that the types for these tables cannot + * include any extended types. **/ #ifndef TOR_LIB_CONF_CONFDECL_H ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [snowflake/master] Changed variable name for multiplexed clients
commit 300a23c6a0071a910ee3b56f7bf14e4f9529ee3f
Author: Cecylia Bocovich
Date: Thu Oct 31 12:08:43 2019 -0400
Changed variable name for multiplexed clients
The variable maxNumClients was unused, while connectionsPerClient was
used for spawning multiple proxyPairs. The former is a more appropriate
name for the multiplexing behaviour we use it for.
Multiplexing now just works thanks to implementing ticket #31310.
---
proxy/config.js| 2 --
proxy/snowflake.js | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/proxy/config.js b/proxy/config.js
index 95ae92e..9564f82 100644
--- a/proxy/config.js
+++ b/proxy/config.js
@@ -24,8 +24,6 @@ Config.prototype.defaultBrokerPollInterval = 300.0 * 1000;
Config.prototype.maxNumClients = 1;
-Config.prototype.connectionsPerClient = 1;
-
// TODO: Different ICE servers.
Config.prototype.pcConfig = {
iceServers: [
diff --git a/proxy/snowflake.js b/proxy/snowflake.js
index ba1ef03..0e9730e 100644
--- a/proxy/snowflake.js
+++ b/proxy/snowflake.js
@@ -119,7 +119,7 @@ class Snowflake {
}
makeProxyPair() {
-if (this.proxyPairs.length >= this.config.connectionsPerClient) {
+if (this.proxyPairs.length >= this.config.maxNumClients) {
return null;
}
var pair;
___
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.0
commit 329aa1c48ef838bd0ef0e83d829f1a6533b8f77f Merge: 29940511e 7beaaed24 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.1] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113 Merge: 2abff832d 853b6ad09 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.2.9' into maint-0.3.5
commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113 Merge: 2abff832d 853b6ad09 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.0' into maint-0.4.1
commit 29eb7b07ef5d5af0c54bbc36804363a0bfdd3252 Merge: 7043be968 329aa1c48 Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.0] Merge branch 'maint-0.4.0' into release-0.4.0
commit 76177368c97c912cc1507e3eeed361c3ca169955 Merge: c0543ac32 329aa1c48 Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.0' into release-0.4.0 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.1' into maint-0.4.2
commit a920597f629c4eee959e0f789d7b6da48da74579 Merge: 8b1f99c29 29eb7b07e Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.1] Merge branch 'maint-0.3.5' into maint-0.4.0
commit 329aa1c48ef838bd0ef0e83d829f1a6533b8f77f Merge: 29940511e 7beaaed24 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.0] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113 Merge: 2abff832d 853b6ad09 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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 'maint-0.3.5' into release-0.3.5
commit d1bd1986867713be146a84639ed22ae2dd95795e Merge: 58046be10 7beaaed24 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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 111f988b5c586ce34a1e482561a988f4794ea6e8 Merge: 253a45115 a920597f6 Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.2' into release-0.4.2 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
commit 15a2c20e338e9e9cecfbb28a4d2aa14cd4c2a47d Merge: d7f76b8c4 853b6ad09 Author: Nick Mathewson Date: Mon Nov 11 10:14:02 2019 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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'
commit eb8ea92cf9d93dc2d86d1e62e26110fbca7fdf59 Merge: 834477622 a920597f6 Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.2' changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.0
commit 329aa1c48ef838bd0ef0e83d829f1a6533b8f77f Merge: 29940511e 7beaaed24 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.1] Merge branch 'maint-0.4.0' into maint-0.4.1
commit 29eb7b07ef5d5af0c54bbc36804363a0bfdd3252 Merge: 7043be968 329aa1c48 Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.2.9' into maint-0.3.5
commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113 Merge: 2abff832d 853b6ad09 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.1] Merge branch 'maint-0.4.1' into release-0.4.1
commit 108cd4965e6c03d95964cbf391c9da68997d41f5 Merge: 06bbcbe45 29eb7b07e Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.1' into release-0.4.1 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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 'maint-0.2.9' into maint-0.3.5
commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113 Merge: 2abff832d 853b6ad09 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.1' into maint-0.4.2
commit a920597f629c4eee959e0f789d7b6da48da74579 Merge: 8b1f99c29 29eb7b07e Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.0] Merge branch 'maint-0.3.5' into maint-0.4.0
commit 329aa1c48ef838bd0ef0e83d829f1a6533b8f77f Merge: 29940511e 7beaaed24 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.0' into maint-0.4.1
commit 29eb7b07ef5d5af0c54bbc36804363a0bfdd3252 Merge: 7043be968 329aa1c48 Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.2.9' into maint-0.3.5
commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113 Merge: 2abff832d 853b6ad09 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.1] Merge branch 'maint-0.3.5' into maint-0.4.0
commit 329aa1c48ef838bd0ef0e83d829f1a6533b8f77f Merge: 29940511e 7beaaed24 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.4.1' into maint-0.4.2
commit a920597f629c4eee959e0f789d7b6da48da74579 Merge: 8b1f99c29 29eb7b07e Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.1] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113 Merge: 2abff832d 853b6ad09 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.4.0' into maint-0.4.1
commit 29eb7b07ef5d5af0c54bbc36804363a0bfdd3252 Merge: 7043be968 329aa1c48 Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.0] Merge branch 'maint-0.3.5' into maint-0.4.0
commit 329aa1c48ef838bd0ef0e83d829f1a6533b8f77f Merge: 29940511e 7beaaed24 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.1] Merge branch 'maint-0.4.0' into maint-0.4.1
commit 29eb7b07ef5d5af0c54bbc36804363a0bfdd3252 Merge: 7043be968 329aa1c48 Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.0
commit 329aa1c48ef838bd0ef0e83d829f1a6533b8f77f Merge: 29940511e 7beaaed24 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.3.5] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113 Merge: 2abff832d 853b6ad09 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.0] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113 Merge: 2abff832d 853b6ad09 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [community/master] Update lego
commit c0c07feb0a9d8830a8cf266794ed9ef0dc0104b4 Author: hiro Date: Mon Nov 11 16:09:03 2019 +0100 Update lego --- databags/menu.ini| 1 + databags/menu_footer.ini | 1 + lego | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/databags/menu.ini b/databags/menu.ini new file mode 12 index 000..94f62ff --- /dev/null +++ b/databags/menu.ini @@ -0,0 +1 @@ +../lego/databags/menu.ini \ No newline at end of file diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini new file mode 12 index 000..e6c1f3b --- /dev/null +++ b/databags/menu_footer.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer.ini \ No newline at end of file diff --git a/lego b/lego index ae51128..07eaef9 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40 +Subproject commit 07eaef9800b90b8de1c490dedc95928d3b789cbf ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update donate button
commit 07eaef9800b90b8de1c490dedc95928d3b789cbf
Author: hiro
Date: Mon Nov 11 16:00:19 2019 +0100
Update donate button
---
templates/footer.html | 2 +-
templates/navbar.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/footer.html b/templates/footer.html
index 555faed..d1681b7 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -46,7 +46,7 @@
{% endfor %}
-https://donate.torproject.org; title="{{ _("Donate")
}}">{{ _("Donate Now")
}}
+https://www.torproject.org/donate/{{ this.alt }}" title="{{
_("Donate") }}">{{ _("Donate
Now") }}
diff --git a/templates/navbar.html b/templates/navbar.html
index a699835..64b5695 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -14,7 +14,7 @@
Tor Logo
-https://donate.torproject.org/; title="{{ _("Donate")
}}">{{ _("Donate Now")
}}
+https://www.torproject.org/donate/{{ this.alt }}" title="{{
_("Donate") }}">{{ _("Donate Now")
}}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 90dcc536983cd59922168535ad73adeadfb2fb88 Author: Translation commit bot Date: Mon Nov 11 14:53:18 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+it.po | 55 ++- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/contents+it.po b/contents+it.po index de240b502..ad5713f89 100644 --- a/contents+it.po +++ b/contents+it.po @@ -5500,6 +5500,11 @@ msgid "" "leave the master identity secret key in DataDirectory/keys, just make a " "backup in case you'll need to reinstall it." msgstr "" +"Se vuoi che il tuo relè funzioni senza attenzioni per un lungo periodo senza" +" dover eseguire manualmente su base regolare il rinnovo della chiave per " +"firmare a medio termine, il meglio è lasciare la chiave di identità segreta " +"principale in DataDirectory/keys, fai solo un backup nel caso in cui sia " +"necessario reinstallarlo." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -5508,6 +5513,9 @@ msgid "" "guide](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity/OfflineKeys)" " on the topic." msgstr "" +"Se vuoi utilizzare questa funzione, puoi consultare la nostra [guida più " +"dettagliata](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity/OfflineKeys)" +" sull'argomento." #: https//support.torproject.org/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.title) @@ -5524,6 +5532,9 @@ msgid "" "For the most in-depth resource on running a relay, see the [Relay Setup " "Guide](https://community.torproject.org/relay/setup)." msgstr "" +"Per la risorsa più approfondita sull'esecuzione di un relè, consultare la " +"[Guida alla configurazione del " +"relè](https://community.torproject.org/relay/setup)." #: https//support.torproject.org/operators/operators-2/ #: (content/operators/operators-2/contents+en.lrquestion.title) @@ -5621,7 +5632,7 @@ msgstr "$ sudo apt-get install tor deb.torproject.org-keyring" #: https//support.torproject.org/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.title) msgid "How do I run an obfs4 bridge?" -msgstr "" +msgstr "Come posso eseguire un bridge obfs4?" #: https//support.torproject.org/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) @@ -5630,6 +5641,9 @@ msgid "" "guide](https://community.torproject.org/relay/setup/bridge/) to learn how to" " set up an obfs4 bridge." msgstr "" +"Consulta la nostra [guida configurazione " +"obfs4](https://community.torproject.org/relay/setup/bridge/) per scoprire " +"come impostare un bridge obfs4." #: https//support.torproject.org/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.title) @@ -5689,7 +5703,7 @@ msgstr "" #: https//support.torproject.org/operators/outgoing-firewall/ #: (content/operators/outgoing-firewall/contents+en.lrquestion.title) msgid "How should I configure the outgoing filters on my relay?" -msgstr "" +msgstr "Come dovrei configurare i filtri in uscita sul mio relè?" #: https//support.torproject.org/operators/outgoing-firewall/ #: (content/operators/outgoing-firewall/contents+en.lrquestion.description) @@ -5697,6 +5711,8 @@ msgid "" "All outgoing connections must be allowed, so that each relay can communicate" " with every other relay." msgstr "" +"Tutte le connessioni in uscita devono essere consentite, così che ciascun " +"relè possa comunicare con ogni altro relè." #: https//support.torproject.org/operators/outgoing-firewall/ #: (content/operators/outgoing-firewall/contents+en.lrquestion.description) @@ -5705,17 +5721,23 @@ msgid "" " common carrier regulations that prevent internet service providers from " "being held liable for third-party content that passes through their network." msgstr "" +"In molte giurisdizioni, gli operatori di relè Tor sono legalmente protetti " +"dalle stesse normative comuni che impediscono ai fornitori di servizi " +"Internet di essere ritenuti responsabili per i contenuti di terzi che " +"passano attraverso la loro rete." #: https//support.torproject.org/operators/outgoing-firewall/ #: (content/operators/outgoing-firewall/contents+en.lrquestion.description) msgid "" "Exit relays that filter some traffic would likely forfeit those protections." msgstr "" +"I relè di uscita che filtrano parte del traffico perderebbero probabilmente " +"quelle protezioni." #: https//support.torproject.org/operators/outgoing-firewall/ #: (content/operators/outgoing-firewall/contents+en.lrquestion.description) msgid "Tor promotes free network access without interference." -msgstr "" +msgstr "Tor promuove libero accesso alla rete senza interferenze." #: https//support.torproject.org/operators/outgoing-firewall/ #:
[tor-commits] [translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
commit ca8b260acebfaaa0032a488cb54622f575f283f3 Author: Translation commit bot Date: Mon Nov 11 14:45:22 2019 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- nl/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po index 349f8da51..e67ab4677 100644 --- a/nl/LC_MESSAGES/bridgedb.po +++ b/nl/LC_MESSAGES/bridgedb.po @@ -27,8 +27,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-10-25 12:07+\n" -"Last-Translator: Tonnes \n" +"PO-Revision-Date: 2019-11-11 14:33+\n" +"Last-Translator: kwadronaut \n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -181,7 +181,7 @@ msgstr "Nee" #: bridgedb/distributors/https/templates/options.html:94 msgid "none" -msgstr "" +msgstr "geen" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit 493bdf22b940169886534c1c7b2fd908677bf1c3 Author: Translation commit bot Date: Mon Nov 11 14:45:15 2019 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- nl/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po index fb527221b..7b3250a13 100644 --- a/nl/LC_MESSAGES/bridgedb.po +++ b/nl/LC_MESSAGES/bridgedb.po @@ -27,8 +27,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-10-25 12:07+\n" -"Last-Translator: Tonnes \n" +"PO-Revision-Date: 2019-11-11 14:33+\n" +"Last-Translator: kwadronaut \n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit d93d6bd565c6bc9046de86ab279b67b128a5737b Author: Translation commit bot Date: Mon Nov 11 14:23:30 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+it.po | 39 ++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/contents+it.po b/contents+it.po index 408e82b31..de240b502 100644 --- a/contents+it.po +++ b/contents+it.po @@ -5344,11 +5344,16 @@ msgid "" "or of their network, even if they're not all in the same geographic " "location." msgstr "" +"Dovresti impostare MyFamily se hai il controllo amministrativo dei computer " +"o della loro rete, anche se non sono tutti nella stessa posizione " +"geografica." #: https//support.torproject.org/operators/my-relay-got-guard-flag-traffic-dropped/ #: (content/operators/my-relay-got-guard-flag-traffic-dropped/contents+en.lrquestion.title) msgid "My relay recently got the Guard flag and traffic dropped by half." msgstr "" +"Il mio relè ha recentemente ottenuto lo stato di Guard e il traffico si è " +"dimezzato. " #: https//support.torproject.org/operators/my-relay-got-guard-flag-traffic-dropped/ #: (content/operators/my-relay-got-guard-flag-traffic-dropped/contents+en.lrquestion.description) @@ -5366,16 +5371,21 @@ msgid "" "Understanding and Improving Entry Guard Selection in " "Tor](http://freehaven.net/anonbib/#wpes12-cogs)." msgstr "" +"Scopri ulteriori dettagli in questo [blog " +"post](https://blog.torproject.org/blog/lifecycle-of-a-new-relay) o in " +"[Changing of the Guards: A Framework for Understanding and Improving Entry " +"Guard Selection in Tor](http://freehaven.net/anonbib/#wpes12-cogs)." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.title) msgid "How do offline ed25519 identity keys work? What do I need to know?" msgstr "" +"Come funzionano le chiavi di identità ed25519 offline? Cosa devo sapere?" #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) msgid "In simple words, it works like this:" -msgstr "" +msgstr "In parole semplici, funziona così:" #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -5383,6 +5393,8 @@ msgid "" "* There is a master ed25519 identity secret key file named " "\"ed25519_master_id_secret_key\"." msgstr "" +"* C'è un file principale della chiave di identità segreta ed25519 denominato" +" \"ed25519_master_id_secret_key\"." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -5390,6 +5402,8 @@ msgid "" "This is the most important one, so make sure you keep a backup in a secure " "place - the file is sensitive and should be protected." msgstr "" +"Questo è il file più importante, quindi assicurati di conservarne una copia " +"in un luogo sicuro: il file è sensibile e deve essere protetto." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -5397,6 +5411,8 @@ msgid "" "Tor could encrypt it for you if you generate it manually and enter a " "password when asked." msgstr "" +"Tor può cifrarlo per te se lo generi manualmente e inserisci una password " +"quando richiesto." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -5404,6 +5420,8 @@ msgid "" "* A medium term signing key named \"ed25519_signing_secret_key\" is " "generated for Tor to use." msgstr "" +"* Una chiave per firmare a medio termine denominata " +"\"ed25519_signing_secret_key\" viene generata per essere utilizzata da Tor." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -5412,6 +5430,10 @@ msgid "" "signed by the master identity secret key and confirms that the medium term " "signing key is valid for a certain period of time." msgstr "" +"Inoltre, viene generato un certificato denominato \"ed25519_signing_cert\" " +"che è firmato dalla chiave di identità segreta principale e conferma che la " +"chiave per firmare a medio termine è valida per un determinato periodo di " +"tempo." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -5419,6 +5441,8 @@ msgid "" "The default validity is 30 days, but this can be customized by setting " "\"SigningKeyLifetime N days|weeks|months\" in torrc." msgstr "" +"La validità predefinita è di 30 giorni, ma può essere personalizzata " +"impostando \"SigningKeyLifetime N giorni|settimane|mesi\" nel torrc." #: https//support.torproject.org/operators/offline-ed25519/ #:
[tor-commits] [onionoo/master] Remove disappearing family members.
commit 941ffd691b7ddaa7d4ae692746f056bcabdfc1d7
Author: Karsten Loesing
Date: Mon Nov 11 10:59:13 2019 +0100
Remove disappearing family members.
When a relay stops writing any family members into its server
descriptor we never cleared old family members but kept them forever.
We should do that.
Fixes #28314.
---
CHANGELOG.md | 7 +++
.../metrics/onionoo/updater/NodeDetailsStatusUpdater.java | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5c4c38..dc93ec6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Changes in version 7.0-1.2?.? - 2019-1?-??
+
+ * Medium changes
+ - Remove declared/alleged family members after they disappear from
+ server descriptors.
+
+
# Changes in version 7.0-1.21.1 - 2019-11-09
* Minor changes
diff --git
a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java
b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java
index a5f16e4..b25459d 100644
---
a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java
+++
b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java
@@ -172,8 +172,8 @@ public class NodeDetailsStatusUpdater implements
DescriptorListener,
detailsStatus.setExitPolicy(descriptor.getExitPolicyLines());
detailsStatus.setContact(descriptor.getContact());
detailsStatus.setPlatform(descriptor.getPlatform());
+SortedSet declaredFamily = new TreeSet<>();
if (descriptor.getFamilyEntries() != null) {
- SortedSet declaredFamily = new TreeSet<>();
for (String familyMember : descriptor.getFamilyEntries()) {
if (familyMember.startsWith("$") && familyMember.length() >= 41) {
declaredFamily.add(
@@ -182,8 +182,8 @@ public class NodeDetailsStatusUpdater implements
DescriptorListener,
declaredFamily.add(familyMember);
}
}
- this.declaredFamilies.put(fingerprint, declaredFamily);
}
+this.declaredFamilies.put(fingerprint, declaredFamily);
if (descriptor.getIpv6DefaultPolicy() != null
&& (descriptor.getIpv6DefaultPolicy().equals("accept")
|| descriptor.getIpv6DefaultPolicy().equals("reject"))
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Donate button url should not be localized
commit 7b0eb82c0e5814c6cf620c48acff0b9517ea4f81
Author: hiro
Date: Mon Nov 11 15:19:31 2019 +0100
Donate button url should not be localized
---
templates/navbar.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/navbar.html b/templates/navbar.html
index 498b005..a699835 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -14,7 +14,7 @@
Tor Logo
-https://donate.torproject.org/{{ '/'|url(alt=this.alt) }}"
title="{{ _("Donate") }}">{{
_("Donate Now") }}
+https://donate.torproject.org/; title="{{ _("Donate")
}}">{{ _("Donate Now")
}}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Document newly added index.json fields.
commit 4259a6dffe28ad26a3b50c079e155e57b40388a9 Author: Karsten Loesing Date: Mon Nov 11 15:06:25 2019 +0100 Document newly added index.json fields. Still part of #31204. --- src/main/resources/web/jsps/collector.jsp | 4 1 file changed, 4 insertions(+) diff --git a/src/main/resources/web/jsps/collector.jsp b/src/main/resources/web/jsps/collector.jsp index 414b23f..d56bdfe 100644 --- a/src/main/resources/web/jsps/collector.jsp +++ b/src/main/resources/web/jsps/collector.jsp @@ -913,6 +913,10 @@ Index files use the following custom JSON data format that might still be extend "path": Relative path of the file. "size": Size of the file in bytes. "last_modified": Timestamp when the file was last modified using pattern "-MM-DD HH:MM" in the UTC timezone. +"types": Descriptor types as found in @type annotations of contained descriptors. +"first_published": Earliest publication timestamp of contained descriptors using pattern "-MM-DD HH:MM" in the UTC timezone. +"last_published": Latest publication timestamp of contained descriptors using pattern "-MM-DD HH:MM" in the UTC timezone. +"sha256": SHA-256 digest of this file. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Change templates and reduce databags
commit 98e55dace8bbfc909ec21d36ef9f7eaca687fa15
Author: hiro
Date: Mon Nov 11 14:17:07 2019 +0100
Change templates and reduce databags
---
databags/menu.ini| 23 +++
databags/menu_footer.ini | 15 +++
templates/footer.html| 2 +-
templates/navbar.html| 2 +-
4 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/databags/menu.ini b/databags/menu.ini
new file mode 100644
index 000..e7a52b2
--- /dev/null
+++ b/databags/menu.ini
@@ -0,0 +1,23 @@
+[about]
+path = https://www.torproject.org/about/history/
+label = About
+
+[documentation]
+path = https://2019.www.torproject.org/docs/documentation.html.en
+label = Documentation
+
+[support]
+path = https://support.torproject.org/
+label = Support
+
+[community]
+path = https://community.torproject.org/
+label = Community
+
+[blog]
+path = https://blog.torproject.org
+label = Blog
+
+[donate]
+path = https://donate.torproject.org
+label = Donate
diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini
new file mode 100644
index 000..c997390
--- /dev/null
+++ b/databags/menu_footer.ini
@@ -0,0 +1,15 @@
+[jobs]
+path = https://www.torproject.org/about/jobs/
+label = Jobs
+
+[blog]
+path = https://blog.torproject.org
+label = Blog
+
+[contact]
+path = https://www.torproject.org/contact/
+label = Contact
+
+[press]
+path = https://www.torproject.org/press/
+label = Press
diff --git a/templates/footer.html b/templates/footer.html
index 63f9f46..555faed 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -29,7 +29,7 @@
- {% set menubag = 'menu_footer+' + this.alt %}
+ {% set menubag = 'menu_footer' %}
{% for id, item in bag(menubag).items() %}
{% set link = site.get(item.path) %}
diff --git a/templates/navbar.html b/templates/navbar.html
index 96c0961..498b005 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -25,7 +25,7 @@
- {% set menubag = 'menu+' + this.alt %}
+ {% set menubag = 'menu' %}
{% for id, item in bag(menubag).items() %}
{% set link = site.get(item.path) %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Doxygen: enable source code browser
commit bd6bd7d28eb2718b6c2bfd9fa60d1a855d177f5d Author: Nick Mathewson Date: Tue Nov 5 12:52:28 2019 -0500 Doxygen: enable source code browser --- Doxyfile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Doxyfile.in b/Doxyfile.in index be500bbfa..4569df545 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -984,7 +984,7 @@ USE_MDFILE_AS_MAINPAGE = # also VERBATIM_HEADERS is set to NO. # The default value is: NO. -SOURCE_BROWSER = NO +SOURCE_BROWSER = YES # Setting the INLINE_SOURCES tag to YES will include the body of functions, # classes and enums directly into the documentation. @@ -997,13 +997,13 @@ INLINE_SOURCES = NO # Fortran comments will always remain visible. # The default value is: YES. -STRIP_CODE_COMMENTS= YES +STRIP_CODE_COMMENTS= NO # If the REFERENCED_BY_RELATION tag is set to YES then for each documented # entity all documented functions referencing it will be listed. # The default value is: NO. -REFERENCED_BY_RELATION = NO +REFERENCED_BY_RELATION = YES # If the REFERENCES_RELATION tag is set to YES then for each documented function # all documented entities called/used by that function will be listed. ___ 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/1504'
commit 8344776224f83e7438167039d0bbfffe0523123c Merge: 8af8ed72b d7872b775 Author: George Kadianakis Date: Mon Nov 11 14:47:33 2019 +0200 Merge branch 'tor-github/pr/1504' Doxyfile.in | 8 doc/include.am | 1 + doc/tor-doxygen.css | 10 ++ 3 files changed, 15 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Doxygen: provide a style sheet
commit d7872b775d77fb40a88695b5bea11f751262ad1f
Author: Nick Mathewson
Date: Tue Nov 5 13:04:51 2019 -0500
Doxygen: provide a style sheet
This sheet tries to make links to the source code browser less obtrusive.
---
Doxyfile.in | 2 +-
doc/include.am | 1 +
doc/tor-doxygen.css | 10 ++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Doxyfile.in b/Doxyfile.in
index 4569df545..a4e4445cc 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -1162,7 +1162,7 @@ HTML_STYLESHEET=
# list). For an example see the documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_EXTRA_STYLESHEET =
+HTML_EXTRA_STYLESHEET = doc/tor-doxygen.css
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
diff --git a/doc/include.am b/doc/include.am
index a9d3fa1c9..8651f845e 100644
--- a/doc/include.am
+++ b/doc/include.am
@@ -47,6 +47,7 @@ EXTRA_DIST+= doc/asciidoc-helper.sh \
$(html_in) $(man_in) $(txt_in) \
doc/state-contents.txt \
doc/torrc_format.txt \
+doc/tor-doxygen.css\
doc/TUNING \
doc/HACKING/README.1st.md \
doc/HACKING/CodingStandards.md \
diff --git a/doc/tor-doxygen.css b/doc/tor-doxygen.css
new file mode 100644
index 0..97cd1886d
--- /dev/null
+++ b/doc/tor-doxygen.css
@@ -0,0 +1,10 @@
+
+p.definition {
+font-size: small;
+padding-left: 1.5em;
+}
+
+p.reference {
+font-size: small;
+padding-left: 1.5em;
+}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-persistence-setup] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup
commit cc689625c3bb2986d42a43b42badc8f3526e15d9 Author: Translation commit bot Date: Mon Nov 11 11:49:39 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup --- nl/nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/nl.po b/nl/nl.po index dd43a57cc..08adee1e4 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2019-10-21 09:06+0200\n" -"PO-Revision-Date: 2019-11-11 11:13+\n" +"PO-Revision-Date: 2019-11-11 11:23+\n" "Last-Translator: kwadronaut \n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\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
