[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit 1d7baec46f043d04d5be0f177f3de6988633b7ff Author: Translation commit bot Date: Tue Jun 11 22:15:39 2019 + Update translations for donatepages-messagespot --- locale/pl/LC_MESSAGES/messages.po | 4 1 file changed, 4 insertions(+) diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po index 80caa06d0..1d4f0d7f9 100644 --- a/locale/pl/LC_MESSAGES/messages.po +++ b/locale/pl/LC_MESSAGES/messages.po @@ -1951,6 +1951,10 @@ msgid "" "href=\"https://www.torproject.org/docs/faq.html.en#HowDoIDecide\;>operate a " "Tor relay." msgstr "" +"Może twoja firma byÅaby skÅonna https://www.torproject.org/docs/faq.html.en#HowDoIDecide\;>prowadziÄ " +"przekaźnik Tor." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:604 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit 86787295e0a0ee0fb4c9d389ecb563cbf19ec899 Author: Translation commit bot Date: Tue Jun 11 21:45:40 2019 + Update translations for donatepages-messagespot --- locale/pl/LC_MESSAGES/messages.po | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po index 4186af0c4..80caa06d0 100644 --- a/locale/pl/LC_MESSAGES/messages.po +++ b/locale/pl/LC_MESSAGES/messages.po @@ -9,12 +9,12 @@ # erinm, 2019 # Dawid Job , 2019 # Filip , 2019 -# Dawid Potocki , 2019 # Waldemar Stoczkowski, 2019 +# Dawid Potocki , 2019 # msgid "" msgstr "" -"Last-Translator: Waldemar Stoczkowski, 2019\n" +"Last-Translator: Dawid Potocki , 2019\n" "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n" "Language: pl\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" @@ -1916,6 +1916,9 @@ msgid "" "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\;>list of " "areas where we would love your help." msgstr "" +"Oto https://www.torproject.org/getinvolved/volunteer.html.en\;>lista " +"obszarów, w których bylibyÅmy wdziÄczni za pomoc." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:592 msgid "I would like my company to support Tor." @@ -1930,12 +1933,16 @@ msgid "" "Your company could match donations made by its employees to the Tor Project" "--that would be wonderful." msgstr "" +"Twoja firma mogÅaby dorównaÄ darowiznom zrobionych przez pracowników na " +"rzecz Tor Project--to byÅoby cudowne." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:600 msgid "" "Your company may operate a corporate foundation that gives out grants, and " "if so, you should encourage it to fund us." msgstr "" +"Twoja firma może prowadziÄ fundacjÄ korporacyjnÄ , która udziela dotacji, a " +"jeÅli tak jest, powinieneÅ zachÄciÄ jÄ do finansowania nas." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:602 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Add the ro locale for Tor Browser alpha
commit 12e576c0f3b1eb26e450a8f371df11ab9dbbbcaa Author: Nicolas Vigier Date: Tue Jun 11 22:36:48 2019 +0200 Add the ro locale for Tor Browser alpha --- databags/download-alternatives-alpha.ini | 4 1 file changed, 4 insertions(+) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index ebbe7a6..92ab78f 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -90,6 +90,10 @@ language = Polszczyzna (pl) url = /pt-BR/ language = Português Brasil(pt-BR) +[ro] +url = /ro/ +language = RomânÄ (ro) + [ru] language = Ð ÑÑÑкий (ru) url = /ru/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Add new Tor Browser version: 9.0a2
commit ec24bd813b8e1b6bcad02c3ca317fb831e35c9f7 Author: Nicolas Vigier Date: Tue Jun 11 22:27:11 2019 +0200 Add new Tor Browser version: 9.0a2 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +- databags/versions.ini | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index ebf1875..de47691 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -16,5 +16,9 @@ body: "9.0a1", "9.0a1-MacOS", "9.0a1-Linux", -"9.0a1-Windows" +"9.0a1-Windows", +"9.0a2", +"9.0a2-MacOS", +"9.0a2-Linux", +"9.0a2-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index fcf94af..ca363ef 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -4,8 +4,8 @@ release_date = 2019-06-04 win32 = 0.3.5.8 [torbrowser-alpha] -version = 9.0a1 -release_date = 2019-05-22 +version = 9.0a2 +release_date = 2019-06-11 [tor-stable] version = 0.4.0.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit cbf323c4d6fc87f69d4d3108fecffd4a576e9ef3 Author: Translation commit bot Date: Tue Jun 11 19:46:15 2019 + Update translations for https_everywhere_completed --- de/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd index ed8684271..bddde9834 100644 --- a/de/https-everywhere.dtd +++ b/de/https-everywhere.dtd @@ -35,6 +35,7 @@ + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit 0cf29155dc4485945582ffef496154c72c584a4c Author: Translation commit bot Date: Tue Jun 11 19:46:05 2019 + Update translations for https_everywhere --- de/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd index bab3021b3..bddde9834 100644 --- a/de/https-everywhere.dtd +++ b/de/https-everywhere.dtd @@ -35,7 +35,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit 0936f5e2d323ebc1076ec211fd6a2993ba6c7bec Author: Translation commit bot Date: Tue Jun 11 16:15:40 2019 + Update translations for donatepages-messagespot --- locale/pl/LC_MESSAGES/messages.po | 5 + 1 file changed, 5 insertions(+) diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po index 48927b91e..4186af0c4 100644 --- a/locale/pl/LC_MESSAGES/messages.po +++ b/locale/pl/LC_MESSAGES/messages.po @@ -1709,6 +1709,8 @@ msgid "" "What if I don't want to use credit card or PayPal? Is there another way I " "can donate?" msgstr "" +"Co zrobiÄ, jeÅli nie chcÄ korzystaÄ z karty kredytowej lub PayPal? Czy mogÄ " +"w inny sposób przekazaÄ darowiznÄ?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:441 msgid "" @@ -1754,6 +1756,9 @@ msgid "" " to be made in a specific way, so we may need additional information from " "you in order to process yours." msgstr "" +"Należy pamiÄtaÄ, że niektóre metody pÅatnoÅci nie obsÅugujÄ zwrotów lub " +"wymagajÄ ich wykonania w okreÅlony sposób, wiÄc możemy potrzebowaÄ " +"dodatkowych informacji w celu przetworzenia Twoich." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:474 msgid "Can I donate by mail?" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Rework origin circuit tracking to use pubsub
commit 0bce0c339d5f4c6ddeb90c21502a9716fb6cd17a
Author: Taylor Yu
Date: Thu Mar 28 17:45:49 2019 -0500
Rework origin circuit tracking to use pubsub
Part of ticket 29976.
---
src/app/main/main.c | 1 +
src/core/or/circuitbuild.c | 11 ++--
src/core/or/circuitlist.c| 33 +--
src/core/or/ocirc_event.c| 112 ---
src/core/or/ocirc_event.h| 35 +++
src/feature/control/btrack.c | 9 ++-
src/feature/control/btrack_circuit.c | 52
src/feature/control/btrack_circuit.h | 3 +
src/feature/control/btrack_orconn.c | 19 +++---
src/test/test_btrack.c | 24 +---
src/test/test_circuitstats.c | 2 +-
src/test/test_controller_events.c| 11 ++--
src/test/test_helpers.c | 2 +
13 files changed, 178 insertions(+), 136 deletions(-)
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 54f2afaa0..04a0cec19 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -1257,6 +1257,7 @@ pubsub_connect(void)
* this point, using tor_mainloop_set_delivery_strategy().
*/
tor_mainloop_set_delivery_strategy("orconn", DELIV_IMMEDIATE);
+tor_mainloop_set_delivery_strategy("ocirc", DELIV_IMMEDIATE);
}
}
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index 3a4e72942..ff809c01c 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -522,14 +522,13 @@ origin_circuit_get_guard_state(origin_circuit_t *circ)
static void
circuit_chan_publish(const origin_circuit_t *circ, const channel_t *chan)
{
- ocirc_event_msg_t msg;
+ ocirc_chan_msg_t *msg = tor_malloc(sizeof(*msg));
- msg.type = OCIRC_MSGTYPE_CHAN;
- msg.u.chan.gid = circ->global_identifier;
- msg.u.chan.chan = chan->global_identifier;
- msg.u.chan.onehop = circ->build_state->onehop_tunnel;
+ msg->gid = circ->global_identifier;
+ msg->chan = chan->global_identifier;
+ msg->onehop = circ->build_state->onehop_tunnel;
- ocirc_event_publish();
+ ocirc_chan_publish(msg);
}
/** Start establishing the first hop of our circuit. Figure out what
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index 72952a8a5..55f04a77b 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -496,17 +496,16 @@ int
circuit_event_status(origin_circuit_t *circ, circuit_status_event_t tp,
int reason_code)
{
- ocirc_event_msg_t msg;
+ ocirc_cevent_msg_t *msg = tor_malloc(sizeof(*msg));
tor_assert(circ);
- msg.type = OCIRC_MSGTYPE_CEVENT;
- msg.u.cevent.gid = circ->global_identifier;
- msg.u.cevent.evtype = tp;
- msg.u.cevent.reason = reason_code;
- msg.u.cevent.onehop = circ->build_state->onehop_tunnel;
+ msg->gid = circ->global_identifier;
+ msg->evtype = tp;
+ msg->reason = reason_code;
+ msg->onehop = circ->build_state->onehop_tunnel;
- ocirc_event_publish();
+ ocirc_cevent_publish(msg);
return control_event_circuit_status(circ, tp, reason_code);
}
@@ -514,26 +513,25 @@ circuit_event_status(origin_circuit_t *circ,
circuit_status_event_t tp,
* Helper function to publish a state change message
*
* circuit_set_state() calls this to notify subscribers about a change
- * of the state of an origin circuit.
+ * of the state of an origin circuit. @a circ must be an origin
+ * circuit.
**/
static void
circuit_state_publish(const circuit_t *circ)
{
- ocirc_event_msg_t msg;
+ ocirc_state_msg_t *msg = tor_malloc(sizeof(*msg));
const origin_circuit_t *ocirc;
- if (!CIRCUIT_IS_ORIGIN(circ))
-return;
+ tor_assert(CIRCUIT_IS_ORIGIN(circ));
ocirc = CONST_TO_ORIGIN_CIRCUIT(circ);
/* Only inbound OR circuits can be in this state, not origin circuits. */
tor_assert(circ->state != CIRCUIT_STATE_ONIONSKIN_PENDING);
- msg.type = OCIRC_MSGTYPE_STATE;
- msg.u.state.gid = ocirc->global_identifier;
- msg.u.state.state = circ->state;
- msg.u.state.onehop = ocirc->build_state->onehop_tunnel;
+ msg->gid = ocirc->global_identifier;
+ msg->state = circ->state;
+ msg->onehop = ocirc->build_state->onehop_tunnel;
- ocirc_event_publish();
+ ocirc_state_publish(msg);
}
/** Change the state of circ to state, adding it to or removing
@@ -565,7 +563,8 @@ circuit_set_state(circuit_t *circ, uint8_t state)
if (state == CIRCUIT_STATE_GUARD_WAIT || state == CIRCUIT_STATE_OPEN)
tor_assert(!circ->n_chan_create_cell);
circ->state = state;
- circuit_state_publish(circ);
+ if (CIRCUIT_IS_ORIGIN(circ))
+circuit_state_publish(circ);
}
/** Append to out all circuits in state CHAN_WAIT waiting for
diff --git a/src/core/or/ocirc_event.c b/src/core/or/ocirc_event.c
index 4a6fc748c..3cb914713 100644
--- a/src/core/or/ocirc_event.c
+++ b/src/core/or/ocirc_event.c
@@ -26,59 +26,103 @@
#include "core/or/origin_circuit_st.h"
#include "lib/subsys/subsys.h"
-/** List of subscribers */
-static smartlist_t
[tor-commits] [tor/master] Add changes file for 29976
commit 5f5f6bb8fb68d171a39eb1e5c6e6649087ec551d Author: Taylor Yu Date: Wed May 22 16:33:04 2019 -0500 Add changes file for 29976 --- changes/ticket29976 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket29976 b/changes/ticket29976 new file mode 100644 index 0..9991bfb1f --- /dev/null +++ b/changes/ticket29976 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: +- Rework bootstrap tracking to use the new publish-subscribe + subsystem. Closes ticket 29976. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Multiple subscribers or publishers per subsystem
commit a8a0144d1183a3598bffe6c552507c9dcbdcd474
Author: Taylor Yu
Date: Mon Apr 1 14:53:39 2019 -0500
Multiple subscribers or publishers per subsystem
Allow a subsystem to register to publish or subscribe a given message
from multiple places.
Part of ticket 29976.
---
src/lib/pubsub/pubsub_check.c | 26 +-
src/test/test_pubsub_build.c | 43 ---
2 files changed, 5 insertions(+), 64 deletions(-)
diff --git a/src/lib/pubsub/pubsub_check.c b/src/lib/pubsub/pubsub_check.c
index a3c22d4f2..bf1196df2 100644
--- a/src/lib/pubsub/pubsub_check.c
+++ b/src/lib/pubsub/pubsub_check.c
@@ -172,34 +172,20 @@ pubsub_cfg_dump(const pubsub_cfg_t *cfg, int severity,
const char *prefix)
/**
* Helper: fill a bitarray out with entries corresponding to the
- * subsystems listed in items. If any subsystem is listed more than
- * once, log a warning. Return 0 on success, -1 on failure.
+ * subsystems listed in items.
**/
-static int
+static void
get_message_bitarray(const pubsub_adjmap_t *map,
- message_id_t msg,
const smartlist_t *items,
- const char *operation,
bitarray_t **out)
{
- bool ok = true;
*out = bitarray_init_zero((unsigned)map->n_subsystems);
if (! items)
-return 0;
+return;
SMARTLIST_FOREACH_BEGIN(items, const pubsub_cfg_t *, cfg) {
-if (bitarray_is_set(*out, cfg->subsys)) {
- log_warn(LD_MESG|LD_BUG,
- "Message \"%s\" is configured to be %s by subsystem "
- "\"%s\" more than once.",
- get_message_id_name(msg), operation,
- get_subsys_id_name(cfg->subsys));
- ok = false;
-}
bitarray_set(*out, cfg->subsys);
} SMARTLIST_FOREACH_END(cfg);
-
- return ok ? 0 : -1;
}
/**
@@ -222,10 +208,8 @@ lint_message_graph(const pubsub_adjmap_t *map,
bitarray_t *subscribed_by = NULL;
bool ok = true;
- if (get_message_bitarray(map, msg, pub, "published", _by) < 0)
-ok = false;
- if (get_message_bitarray(map, msg, sub, "subscribed", _by) < 0)
-ok = false;
+ get_message_bitarray(map, pub, _by);
+ get_message_bitarray(map, sub, _by);
/* Check whether any subsystem is publishing and subscribing the same
* message. [??]
diff --git a/src/test/test_pubsub_build.c b/src/test/test_pubsub_build.c
index ce5bf6008..021323fbf 100644
--- a/src/test/test_pubsub_build.c
+++ b/src/test/test_pubsub_build.c
@@ -493,48 +493,6 @@ test_pubsub_build_sub_many(void *arg)
tor_free(sysname);
}
-/* The same subsystem can only declare one publish or subscribe. */
-static void
-test_pubsub_build_pubsub_redundant(void *arg)
-{
- (void)arg;
- pubsub_builder_t *b = NULL;
- dispatch_t *dispatcher = NULL;
- pubsub_connector_t *c = NULL;
-
- b = pubsub_builder_new();
- seed_pubsub_builder_basic(b);
- pub_binding_t btmp;
-
- {
-c = pubsub_connector_for_subsystem(b, get_subsys_id("sys2"));
-DISPATCH_ADD_SUB(c, main, bunch_of_coconuts);
-pubsub_add_pub_(c, , get_channel_id("main"),
-get_message_id("yes_we_have_no"),
-get_msg_type_id("string"),
-0 /* flags */,
-"somewhere.c", 22);
-pubsub_connector_free(c);
- };
-
- setup_full_capture_of_logs(LOG_WARN);
- dispatcher = pubsub_builder_finalize(b, NULL);
- b = NULL;
- tt_assert(dispatcher == NULL);
-
- expect_log_msg_containing(
-"Message \"yes_we_have_no\" is configured to be published by "
-"subsystem \"sys2\" more than once.");
- expect_log_msg_containing(
-"Message \"bunch_of_coconuts\" is configured to be subscribed by "
-"subsystem \"sys2\" more than once.");
-
- done:
- pubsub_builder_free(b);
- dispatch_free(dispatcher);
- teardown_capture_of_logs();
-}
-
/* It's fine to declare the excl flag. */
static void
test_pubsub_build_excl_ok(void *arg)
@@ -614,7 +572,6 @@ struct testcase_t pubsub_build_tests[] = {
T(pubsub_same, TT_FORK),
T(pubsub_multi, TT_FORK),
T(sub_many, TT_FORK),
- T(pubsub_redundant, TT_FORK),
T(excl_ok, TT_FORK),
T(excl_bad, TT_FORK),
END_OF_TESTCASES
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Rework orconn tracking to use pubsub
commit a8c0f4ddfe3f0a63bd499959c8d921346aa9766e
Author: Taylor Yu
Date: Fri Mar 8 09:41:43 2019 -0600
Rework orconn tracking to use pubsub
Part of ticket 29976.
---
src/app/main/main.c | 1 +
src/core/or/connection_or.c | 28 ++--
src/core/or/orconn_event.c | 90 ++---
src/core/or/orconn_event.h | 31 +++--
src/feature/control/btrack.c| 8
src/feature/control/btrack_orconn.c | 49 ++--
src/feature/control/btrack_orconn.h | 3 ++
src/test/test_btrack.c | 65 +--
src/test/test_controller_events.c | 51 -
src/test/test_extorport.c | 2 +-
src/test/test_helpers.c | 54 ++
src/test/test_helpers.h | 6 +++
12 files changed, 242 insertions(+), 146 deletions(-)
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 6e325f0b1..54f2afaa0 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -1256,6 +1256,7 @@ pubsub_connect(void)
/* For each pubsub channel, its delivery strategy should be set at
* this point, using tor_mainloop_set_delivery_strategy().
*/
+tor_mainloop_set_delivery_strategy("orconn", DELIV_IMMEDIATE);
}
}
diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c
index 830e09fd5..4c93351e3 100644
--- a/src/core/or/connection_or.c
+++ b/src/core/or/connection_or.c
@@ -414,13 +414,12 @@ void
connection_or_event_status(or_connection_t *conn, or_conn_status_event_t tp,
int reason)
{
- orconn_event_msg_t msg;
+ orconn_status_msg_t *msg = tor_malloc(sizeof(*msg));
- msg.type = ORCONN_MSGTYPE_STATUS;
- msg.u.status.gid = conn->base_.global_identifier;
- msg.u.status.status = tp;
- msg.u.status.reason = reason;
- orconn_event_publish();
+ msg->gid = conn->base_.global_identifier;
+ msg->status = tp;
+ msg->reason = reason;
+ orconn_status_publish(msg);
control_event_or_conn_status(conn, tp, reason);
}
@@ -433,26 +432,25 @@ connection_or_event_status(or_connection_t *conn,
or_conn_status_event_t tp,
static void
connection_or_state_publish(const or_connection_t *conn, uint8_t state)
{
- orconn_event_msg_t msg;
+ orconn_state_msg_t *msg = tor_malloc(sizeof(*msg));
- msg.type = ORCONN_MSGTYPE_STATE;
- msg.u.state.gid = conn->base_.global_identifier;
+ msg->gid = conn->base_.global_identifier;
if (conn->is_pt) {
/* Do extra decoding because conn->proxy_type indicates the proxy
* protocol that tor uses to talk with the transport plugin,
* instead of PROXY_PLUGGABLE. */
tor_assert_nonfatal(conn->proxy_type != PROXY_NONE);
-msg.u.state.proxy_type = PROXY_PLUGGABLE;
+msg->proxy_type = PROXY_PLUGGABLE;
} else {
-msg.u.state.proxy_type = conn->proxy_type;
+msg->proxy_type = conn->proxy_type;
}
- msg.u.state.state = state;
+ msg->state = state;
if (conn->chan) {
-msg.u.state.chan = TLS_CHAN_TO_BASE(conn->chan)->global_identifier;
+msg->chan = TLS_CHAN_TO_BASE(conn->chan)->global_identifier;
} else {
-msg.u.state.chan = 0;
+msg->chan = 0;
}
- orconn_event_publish();
+ orconn_state_publish(msg);
}
/** Call this to change or_connection_t states, so the owning channel_tls_t can
diff --git a/src/core/or/orconn_event.c b/src/core/or/orconn_event.c
index 9fb34bd1f..86f112fc0 100644
--- a/src/core/or/orconn_event.c
+++ b/src/core/or/orconn_event.c
@@ -17,65 +17,83 @@
**/
#include "core/or/or.h"
+#include "lib/pubsub/pubsub.h"
#include "lib/subsys/subsys.h"
#define ORCONN_EVENT_PRIVATE
#include "core/or/orconn_event.h"
#include "core/or/orconn_event_sys.h"
-/** List of subscribers */
-static smartlist_t *orconn_event_rcvrs;
+DECLARE_PUBLISH(orconn_state);
+DECLARE_PUBLISH(orconn_status);
-/** Initialize subscriber list */
-static int
-orconn_event_init(void)
+static void
+orconn_event_free(msg_aux_data_t u)
{
- orconn_event_rcvrs = smartlist_new();
- return 0;
+ tor_free_(u.ptr);
}
-/** Free subscriber list */
-static void
-orconn_event_fini(void)
+static char *
+orconn_state_fmt(msg_aux_data_t u)
{
- smartlist_free(orconn_event_rcvrs);
+ orconn_state_msg_t *msg = (orconn_state_msg_t *)u.ptr;
+ char *s = NULL;
+
+ tor_asprintf(, "",
+ msg->gid, msg->chan, msg->proxy_type, msg->state);
+ return s;
}
-/**
- * Subscribe to messages about OR connection events
- *
- * Register a callback function to receive messages about ORCONNs.
- * The publisher calls this function synchronously.
- **/
-void
-orconn_event_subscribe(orconn_event_rcvr_t fn)
+static char *
+orconn_status_fmt(msg_aux_data_t u)
{
- tor_assert(fn);
- /* Don't duplicate subscriptions. */
- if (smartlist_contains(orconn_event_rcvrs, fn))
-return;
+ orconn_status_msg_t *msg = (orconn_status_msg_t *)u.ptr;
+ char *s = NULL;
- smartlist_add(orconn_event_rcvrs, fn);
[tor-commits] [tor/master] Merge branch 'tor-github/pr/1040'
commit f7e8b3b68c8e2cecfc7ff4072e9f00d316aaba4f
Merge: 8e112cecd 5f5f6bb8f
Author: David Goulet
Date: Tue Jun 11 11:59:39 2019 -0400
Merge branch 'tor-github/pr/1040'
changes/ticket29976 | 3 +
src/app/main/main.c | 2 +
src/core/or/circuitbuild.c | 11 ++--
src/core/or/circuitlist.c| 33 +--
src/core/or/connection_or.c | 28 -
src/core/or/ocirc_event.c| 112 ---
src/core/or/ocirc_event.h| 35 +++
src/core/or/orconn_event.c | 90 +---
src/core/or/orconn_event.h | 31 +++---
src/feature/control/btrack.c | 15 -
src/feature/control/btrack_circuit.c | 52
src/feature/control/btrack_circuit.h | 3 +
src/feature/control/btrack_orconn.c | 68 ++---
src/feature/control/btrack_orconn.h | 3 +
src/lib/pubsub/pubsub_check.c| 26 ++--
src/test/test_btrack.c | 89 ++--
src/test/test_circuitstats.c | 2 +-
src/test/test_controller_events.c| 62 ++-
src/test/test_extorport.c| 2 +-
src/test/test_helpers.c | 56 ++
src/test/test_helpers.h | 6 ++
src/test/test_pubsub_build.c | 43 --
22 files changed, 427 insertions(+), 345 deletions(-)
diff --cc src/core/or/ocirc_event.h
index 59ec9e27c,ad6d69ffb..8e9494874
--- a/src/core/or/ocirc_event.h
+++ b/src/core/or/ocirc_event.h
@@@ -56,34 -61,12 +61,12 @@@ typedef struct ocirc_cevent_msg_t
bool onehop; /**< one-hop circuit? */
} ocirc_cevent_msg_t;
- /** Discriminant values for origin circuit event message */
- typedef enum ocirc_msgtype_t {
- OCIRC_MSGTYPE_STATE,
- OCIRC_MSGTYPE_CHAN,
- OCIRC_MSGTYPE_CEVENT,
- } ocirc_msgtype_t;
-
- /** Discriminated union for the actual message */
- typedef struct ocirc_event_msg_t {
- int type;
- union {
- ocirc_state_msg_t state;
- ocirc_chan_msg_t chan;
- ocirc_cevent_msg_t cevent;
- } u;
- } ocirc_event_msg_t;
-
- /**
- * Receiver function pointer for origin circuit subscribers
- *
- * This function gets called synchronously by the publisher.
- **/
- typedef void (*ocirc_event_rcvr_t)(const ocirc_event_msg_t *);
-
- void ocirc_event_subscribe(ocirc_event_rcvr_t fn);
+ DECLARE_MESSAGE(ocirc_cevent, ocirc_cevent, ocirc_cevent_msg_t *);
#ifdef OCIRC_EVENT_PRIVATE
- void ocirc_event_publish(const ocirc_event_msg_t *msg);
+ void ocirc_state_publish(ocirc_state_msg_t *msg);
+ void ocirc_chan_publish(ocirc_chan_msg_t *msg);
+ void ocirc_cevent_publish(ocirc_cevent_msg_t *msg);
#endif
-#endif /* defined(TOR_OCIRC_EVENT_STATE_H) */
+#endif /* !defined(TOR_OCIRC_EVENT_H) */
diff --cc src/core/or/orconn_event.h
index d6635793d,a3b37d2c3..fb67a7d18
--- a/src/core/or/orconn_event.h
+++ b/src/core/or/orconn_event.h
@@@ -95,26 -93,11 +93,11 @@@ typedef struct orconn_status_msg_t
int reason; /**< reason */
} orconn_status_msg_t;
- /** Discriminated union for the actual message */
- typedef struct orconn_event_msg_t {
- int type;
- union {
- orconn_state_msg_t state;
- orconn_status_msg_t status;
- } u;
- } orconn_event_msg_t;
-
- /**
- * Receiver function pointer for OR subscribers
- *
- * This function gets called synchronously by the publisher.
- **/
- typedef void (*orconn_event_rcvr_t)(const orconn_event_msg_t *);
-
- void orconn_event_subscribe(orconn_event_rcvr_t);
+ DECLARE_MESSAGE(orconn_status, orconn_status, orconn_status_msg_t *);
#ifdef ORCONN_EVENT_PRIVATE
- void orconn_event_publish(const orconn_event_msg_t *);
+ void orconn_state_publish(orconn_state_msg_t *);
+ void orconn_status_publish(orconn_status_msg_t *);
#endif
-#endif /* defined(TOR_ORCONN_EVENT_H) */
+#endif /* !defined(TOR_ORCONN_EVENT_H) */
diff --cc src/feature/control/btrack_circuit.h
index 9e06fefb0,b2ae6484f..b326c22cc
--- a/src/feature/control/btrack_circuit.h
+++ b/src/feature/control/btrack_circuit.h
@@@ -9,7 -9,10 +9,10 @@@
#ifndef TOR_BTRACK_CIRCUIT_H
#define TOR_BTRACK_CIRCUIT_H
+ #include "lib/pubsub/pubsub.h"
+
int btrack_circ_init(void);
void btrack_circ_fini(void);
+ int btrack_circ_add_pubsub(pubsub_connector_t *);
-#endif /* defined(TOR_BTRACK_CIRCUIT_H) */
+#endif /* !defined(TOR_BTRACK_CIRCUIT_H) */
diff --cc src/feature/control/btrack_orconn.h
index f8f5c1096,fed9a58eb..07b1b755f
--- a/src/feature/control/btrack_orconn.h
+++ b/src/feature/control/btrack_orconn.h
@@@ -30,9 -32,10 +32,10 @@@ typedef struct bt_orconn_t
bool is_onehop; /**< Is this for a one-hop circuit? */
} bt_orconn_t;
-#endif /* defined(BTRACK_ORCONN_PRIVATE) */
+#endif /* defined(BTRACK_ORCONN_PRIVATE) */
int btrack_orconn_init(void);
+ int btrack_orconn_add_pubsub(pubsub_connector_t *);
[tor-commits] [tor/master] Prop 301: No longer vote on RecommendedPackages
commit 58cb98af32e8436eccf9536255b8158271f1c03d
Author: Iain R. Learmonth
Date: Thu May 16 12:54:31 2019 +0100
Prop 301: No longer vote on RecommendedPackages
This is the first half of implementing proposal 301. The
RecommendedPackages torrc option is marked as obsolete and
the test cases for the option removed. Additionally, the code relating
to generating and formatting package lines in votes is removed.
These lines may still appear in votes from other directory authorities
running earlier versions of the code and so consensuses may still
contain package lines. A new consensus method will be needed to stop
including package lines in consensuses.
Fixes: #28465
---
changes/ticket29738| 6 ++
doc/tor.1.txt | 6 --
src/app/config/config.c| 9 +
src/app/config/or_options_st.h | 1 -
src/feature/dirauth/dirvote.c | 26 --
src/test/test_options.c| 24
6 files changed, 7 insertions(+), 65 deletions(-)
diff --git a/changes/ticket29738 b/changes/ticket29738
new file mode 100644
index 0..9217cc9a5
--- /dev/null
+++ b/changes/ticket29738
@@ -0,0 +1,6 @@
+ o Minor features (recommended packages):
+- No longer include recommended packages in votes as detailed in proposal
+ 301. The RecommendedPackages torrc option is deprecated and will no
+ longer have any effect. "package" lines will still be considered when
+ computing consensuses for consensus methods that include them. Fixes
+ ticket 29738.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 4bd365c77..064259b15 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2720,12 +2720,6 @@ on the public Tor network.
multiple times: the values from multiple lines are spliced together. When
this is set then **VersioningAuthoritativeDirectory** should be set too.
-[[RecommendedPackages]] **RecommendedPackages** __PACKAGENAME__ __VERSION__
__URL__ __DIGESTTYPE__**=**__DIGEST__ ::
-Adds "package" line to the directory authority's vote. This information
-is used to vote on the correct URL and digest for the released versions
-of different Tor-related packages, so that the consensus can certify
-them. This line may appear any number of times.
-
[[RecommendedClientVersions]] **RecommendedClientVersions** __STRING__::
STRING is a comma-separated list of Tor versions currently believed to be
safe for clients to use. This information is included in version 2
diff --git a/src/app/config/config.c b/src/app/config/config.c
index d03305627..4382a4472 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -593,7 +593,7 @@ static config_var_t option_vars_[] = {
V(RecommendedVersions, LINELIST, NULL),
V(RecommendedClientVersions, LINELIST, NULL),
V(RecommendedServerVersions, LINELIST, NULL),
- V(RecommendedPackages, LINELIST, NULL),
+ OBSOLETE("RecommendedPackages"),
V(ReducedConnectionPadding,BOOL, "0"),
V(ConnectionPadding, AUTOBOOL, "auto"),
V(RefuseUnknownExits, AUTOBOOL, "auto"),
@@ -3521,13 +3521,6 @@ options_validate(or_options_t *old_options, or_options_t
*options,
"features to be broken in unpredictable ways.");
}
- for (cl = options->RecommendedPackages; cl; cl = cl->next) {
-if (! validate_recommended_package_line(cl->value)) {
- log_warn(LD_CONFIG, "Invalid RecommendedPackage line %s will be ignored",
- escaped(cl->value));
-}
- }
-
if (options->AuthoritativeDir) {
if (!options->ContactInfo && !options->TestingTorNetwork)
REJECT("Authoritative directory servers must set ContactInfo");
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 4e03bec7f..7e79834f8 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -121,7 +121,6 @@ struct or_options_t {
struct config_line_t *RecommendedVersions;
struct config_line_t *RecommendedClientVersions;
struct config_line_t *RecommendedServerVersions;
- struct config_line_t *RecommendedPackages;
/** Whether dirservers allow router descriptors with private IPs. */
int DirAllowPrivateAddresses;
/** Whether routers accept EXTEND cells to routers with private IPs. */
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index b841ab240..0084fea1e 100644
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -220,7 +220,6 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
networkstatus_t *v3_ns)
{
smartlist_t *chunks = smartlist_new();
- char *packages = NULL;
char fingerprint[FINGERPRINT_LEN+1];
char digest[DIGEST_LEN];
uint32_t addr;
@@ -246,19 +245,6 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
v3_ns->server_versions);
[tor-commits] [tor/master] Merge branch 'tor-github/pr/1031'
commit 8e112cecd8cf944e095304257563415e60891780 Merge: e9d99d2e1 58cb98af3 Author: David Goulet Date: Tue Jun 11 11:46:38 2019 -0400 Merge branch 'tor-github/pr/1031' changes/ticket29738| 6 ++ doc/tor.1.txt | 6 -- src/app/config/config.c| 9 + src/app/config/or_options_st.h | 1 - src/feature/dirauth/dirvote.c | 26 -- src/test/test_options.c| 24 6 files changed, 7 insertions(+), 65 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] dirauth: Fix some comments in the router status processing code.
commit a4ea335a6906eb4f8f58b5cf458cf290d322d10f
Author: teor
Date: Thu Jun 6 08:45:57 2019 +1000
dirauth: Fix some comments in the router status processing code.
Fixes comments in dirserv_router_get_status() and was_router_added_t.
Preparation for 30780 and 16564.
---
src/feature/dirauth/process_descs.c | 15 ++-
src/feature/nodelist/routerlist.c | 13 +++--
src/feature/nodelist/routerlist.h | 4 ++--
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/feature/dirauth/process_descs.c
b/src/feature/dirauth/process_descs.c
index 656922233..17936add5 100644
--- a/src/feature/dirauth/process_descs.c
+++ b/src/feature/dirauth/process_descs.c
@@ -216,9 +216,14 @@ dirserv_load_fingerprint_file(void)
#define DISABLE_DISABLING_ED25519
-/** Check whether router has a nickname/identity key combination that
- * we recognize from the fingerprint list, or an IP we automatically act on
- * according to our configuration. Return the appropriate router status.
+/** Check whether router has:
+ * - a nickname/identity key combination that we recognize from the fingerprint
+ * list,
+ * - an IP we automatically act on according to our configuration,
+ * - an appropriate version, and
+ * - matching pinned keys.
+ *
+ * Return the appropriate router status.
*
* If the status is 'FP_REJECT' and msg is provided, set
* *msg to an explanation of why. */
@@ -236,7 +241,7 @@ dirserv_router_get_status(const routerinfo_t *router, const
char **msg,
return FP_REJECT;
}
- /* Check for the more usual versions to reject a router first. */
+ /* Check for the more common reasons to reject a router first. */
const uint32_t r = dirserv_get_status_impl(d, router->nickname,
router->addr, router->or_port,
router->platform, msg, severity);
@@ -535,7 +540,7 @@ dirserv_add_multiple_descriptors(const char *desc, size_t
desclen,
int general = purpose == ROUTER_PURPOSE_GENERAL;
tor_assert(msg);
- r=ROUTER_ADDED_SUCCESSFULLY; /*Least severe return value. */
+ r=ROUTER_ADDED_SUCCESSFULLY; /* Least severe return value. */
if (!string_is_utf8_no_bom(desc, desclen)) {
*msg = "descriptor(s) or extrainfo(s) not valid UTF-8 or had BOM.";
diff --git a/src/feature/nodelist/routerlist.c
b/src/feature/nodelist/routerlist.c
index 5788347a0..5948445c9 100644
--- a/src/feature/nodelist/routerlist.c
+++ b/src/feature/nodelist/routerlist.c
@@ -1459,12 +1459,13 @@ router_descriptor_is_older_than,(const routerinfo_t
*router, int seconds))
}
/** Add router to the routerlist, if we don't already have it. Replace
- * older entries (if any) with the same key. Note: Callers should not hold
- * their pointers to router if this function fails; router
- * will either be inserted into the routerlist or freed. Similarly, even
- * if this call succeeds, they should not hold their pointers to
- * router after subsequent calls with other routerinfo's -- they
- * might cause the original routerinfo to get freed.
+ * older entries (if any) with the same key.
+ *
+ * Note: Callers should not hold their pointers to router if this
+ * function fails; router will either be inserted into the routerlist or
+ * freed. Similarly, even if this call succeeds, they should not hold their
+ * pointers to router after subsequent calls with other routerinfo's --
+ * they might cause the original routerinfo to get freed.
*
* Returns the status for the operation. Might set *msg if it wants
* the poster of the router to know something.
diff --git a/src/feature/nodelist/routerlist.h
b/src/feature/nodelist/routerlist.h
index 5771ebb1a..d7f44cb80 100644
--- a/src/feature/nodelist/routerlist.h
+++ b/src/feature/nodelist/routerlist.h
@@ -37,8 +37,8 @@ typedef enum was_router_added_t {
ROUTER_WAS_NOT_WANTED = -6,
/* Router descriptor was rejected because it was older than
* OLD_ROUTER_DESC_MAX_AGE. */
- ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'NOT_NEW' */
- /* DOCDOC */
+ ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'ROUTER_IS_ALREADY_KNOWN' */
+ /* Some certs on this router are expired. */
ROUTER_CERTS_EXPIRED = -8
} was_router_added_t;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit b6861d64097e0e4f06dc1995e814c220278b92aa Author: Translation commit bot Date: Tue Jun 11 15:45:39 2019 + Update translations for donatepages-messagespot --- locale/pl/LC_MESSAGES/messages.po | 32 +--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po index bd7781de3..48927b91e 100644 --- a/locale/pl/LC_MESSAGES/messages.po +++ b/locale/pl/LC_MESSAGES/messages.po @@ -9,12 +9,12 @@ # erinm, 2019 # Dawid Job , 2019 # Filip , 2019 -# Waldemar Stoczkowski, 2019 # Dawid Potocki , 2019 +# Waldemar Stoczkowski, 2019 # msgid "" msgstr "" -"Last-Translator: Dawid Potocki , 2019\n" +"Last-Translator: Waldemar Stoczkowski, 2019\n" "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n" "Language: pl\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" @@ -1077,6 +1077,8 @@ msgid "" "People also support Tor in non-financial ways, for example by running Tor " "relays to help carry traffic for other users." msgstr "" +"Ludzie wspierajÄ także Tora w niefinansowy sposób, na przykÅad uruchamiajÄ c " +"przekaźniki Tora, aby pomóc w przenoszeniu ruchu dla innych użytkowników." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:131 msgid "" @@ -1084,6 +1086,9 @@ msgid "" "anonymous, because the more people using Tor, the harder it is to identify " "any single individual." msgstr "" +"Ponadto wszyscy, którzy używajÄ Tora, pomagajÄ zachowaÄ bezpieczeÅstwo i " +"anonimowoÅÄ innych użytkowników, ponieważ im wiÄcej osób używa Tora, tym " +"trudniej jest zidentyfikowaÄ pojedynczÄ osobÄ." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:137 msgid "How does the Tor software work to protect people's anonymity?" @@ -1095,12 +1100,17 @@ msgid "" "which is a distributed network of relays run by volunteers all around the " "world." msgstr "" +"Tor chroni CiÄ przez odbijanie komunikacji wokóŠsieci Tor, która jest " +"rozproszonÄ sieciÄ przekaźników uruchamianych przez ochotników na caÅym " +"Åwiecie." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:143 msgid "" "If someone is watching your internet connection, Tor prevents them from " "finding out what sites you are visiting." msgstr "" +"JeÅli ktoÅ oglÄ da twoje poÅÄ czenie internetowe, Tor uniemożliwia mu " +"znalezienie odwiedzanych witryn." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:145 msgid "" @@ -1119,6 +1129,8 @@ msgid "" "I would like to know more about how Tor works, what onion services are, or " "how to run a relay." msgstr "" +"ChciaÅbym dowiedzieÄ siÄ wiÄcej o tym, jak dziaÅa Tor, jakie sÄ usÅugi " +"cebulowe lub jak uruchomiÄ przekaźnik." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:158 msgid "" @@ -1137,12 +1149,17 @@ msgid "" "does a better job of keeping you safely anonymous than other options such as" " VPNs, proxychains, or browser \"private browsing\" modes." msgstr "" +"Wierzymy, że Tor jest najlepszym dostÄpnym obecnie rozwiÄ zaniem i wiemy, że " +"lepiej chroni CiÄ anonimowo niż inne opcje, takie jak VPN, proxychains lub " +"tryby âprywatnego przeglÄ daniaâ przeglÄ darki." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:170 msgid "" "We know that both the Russian government and the NSA have tried in the past " "to crack Tor, and failed." msgstr "" +"Wiemy, że zarówno rzÄ d rosyjski, jak i NSA próbowaÅy w przeszÅoÅci zÅamaÄ " +"Tora i poniosÅy porażkÄ." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:172 msgid "" @@ -1236,6 +1253,9 @@ msgid "" " foundations, research institutions, private companies, and over 20,000 " "personal donations from people like you." msgstr "" +"Tor jest wspierany przez agencje finansujÄ ce rzÄ d Stanów Zjednoczonych, " +"organizacje pozarzÄ dowe, prywatne fundacje, instytucje badawcze, prywatne " +"firmy i ponad 20 000 osobistych darowizn od takich osób jak ty." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:212 msgid "" @@ -1261,6 +1281,10 @@ msgid "" " allows us to spend the money on the projects we think are most important " "and respond quickly to changing events." msgstr "" +"Finansowanie spoÅecznoÅciowe pozwala nam zdywersyfikowaÄ naszÄ bazÄ " +"darczyÅców i jest nieograniczone - pozwala nam wydawaÄ pieniÄ dze na " +"projekty, które uważamy za najważniejsze i szybko reagowaÄ na zmieniajÄ ce " +"siÄ wydarzenia." #:
[tor-commits] [tor/master] practracker: accept one extra line in routerlist.c
commit 6be9d3aed88bf73cf10f06edb99f876fd8eeb1d9 Author: teor Date: Thu Jun 6 18:24:17 2019 +1000 practracker: accept one extra line in routerlist.c practracker exception for 30780. --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index eb0625b8d..4f723c7c1 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -216,7 +216,7 @@ problem function-size /src/feature/nodelist/node_select.c:router_pick_directory_ problem function-size /src/feature/nodelist/node_select.c:compute_weighted_bandwidths() 206 problem function-size /src/feature/nodelist/node_select.c:router_pick_trusteddirserver_impl() 114 problem function-size /src/feature/nodelist/nodelist.c:compute_frac_paths_available() 193 -problem file-size /src/feature/nodelist/routerlist.c 3238 +problem file-size /src/feature/nodelist/routerlist.c 3239 problem function-size /src/feature/nodelist/routerlist.c:router_rebuild_store() 148 problem function-size /src/feature/nodelist/routerlist.c:router_add_to_routerlist() 169 problem function-size /src/feature/nodelist/routerlist.c:routerlist_remove_old_routers() 121 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] dirauth: Return a distinct status when formatting annotations fails
commit 19bf5806adb80e513bb2707a1686216225fef420
Author: teor
Date: Thu Jun 6 08:52:13 2019 +1000
dirauth: Return a distinct status when formatting annotations fails
Adds ROUTER_AUTHDIR_BUG_ANNOTATIONS to was_router_added_t.
The out-of-order numbering is deliberate: it will be fixed by later commits
for 16564.
Fixes bug 30780; bugfix on 0.2.0.8-alpha.
---
changes/bug30780| 3 +++
src/feature/dirauth/process_descs.c | 4 +---
src/feature/nodelist/routerlist.h | 5 -
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/changes/bug30780 b/changes/bug30780
new file mode 100644
index 0..5731d201a
--- /dev/null
+++ b/changes/bug30780
@@ -0,0 +1,3 @@
+ o Minor bugfixes (directory authorities):
+- Return a distinct status when formatting annotations fails.
+ Fixes bug 30780; bugfix on 0.2.0.8-alpha.
diff --git a/src/feature/dirauth/process_descs.c
b/src/feature/dirauth/process_descs.c
index 17936add5..a68d15565 100644
--- a/src/feature/dirauth/process_descs.c
+++ b/src/feature/dirauth/process_descs.c
@@ -556,9 +556,7 @@ dirserv_add_multiple_descriptors(const char *desc, size_t
desclen,
!general ? router_purpose_to_string(purpose) : "",
!general ? "\n" : "")<0) {
*msg = "Couldn't format annotations";
-/* XXX Not cool: we return -1 below, but (was_router_added_t)-1 is
- * ROUTER_BAD_EI, which isn't what's gone wrong here. :( */
-return -1;
+return ROUTER_AUTHDIR_BUG_ANNOTATIONS;
}
s = desc;
diff --git a/src/feature/nodelist/routerlist.h
b/src/feature/nodelist/routerlist.h
index d7f44cb80..dc9203e01 100644
--- a/src/feature/nodelist/routerlist.h
+++ b/src/feature/nodelist/routerlist.h
@@ -39,7 +39,10 @@ typedef enum was_router_added_t {
* OLD_ROUTER_DESC_MAX_AGE. */
ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'ROUTER_IS_ALREADY_KNOWN' */
/* Some certs on this router are expired. */
- ROUTER_CERTS_EXPIRED = -8
+ ROUTER_CERTS_EXPIRED = -8,
+ /* We couldn't format the annotations for this router. This is a directory
+ * authority bug. */
+ ROUTER_AUTHDIR_BUG_ANNOTATIONS = -10
} was_router_added_t;
/** How long do we avoid using a directory server after it's given us a 503? */
___
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/1083'
commit e9d99d2e15f09a394ad01189b7965af4888a61a6 Merge: 35dd2d733 6be9d3aed Author: David Goulet Date: Tue Jun 11 11:43:15 2019 -0400 Merge branch 'tor-github/pr/1083' changes/bug30780 | 3 +++ scripts/maint/practracker/exceptions.txt | 2 +- src/feature/dirauth/process_descs.c | 19 +++ src/feature/nodelist/routerlist.c| 13 +++-- src/feature/nodelist/routerlist.h| 9 ++--- 5 files changed, 28 insertions(+), 18 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] Add a changes file for ticket 30686.
commit 5068ccab0b1849e836729c43a2ca891139cf107b Author: Nick Mathewson Date: Wed May 29 09:23:13 2019 -0400 Add a changes file for ticket 30686. --- changes/ticket30686 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket30686 b/changes/ticket30686 new file mode 100644 index 0..36473c1a0 --- /dev/null +++ b/changes/ticket30686 @@ -0,0 +1,5 @@ + o Minor features (logging): +- Give a more useful assertion failure message if we think we have + minherit() but we fail to make a region non-inheritable. Give a + compile-time warning if our support for minherit() is + incomplete. Closes ticket 30686. ___ 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] Give a compile warning when we don't have any flags for minherit().
commit cad0de35bd49064f5712f32a2b6e41ffe6e822e6 Author: Nick Mathewson Date: Wed May 29 09:22:18 2019 -0400 Give a compile warning when we don't have any flags for minherit(). Part of ticket 30686. --- src/lib/malloc/map_anon.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index f4fda00bf..6afea713d 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -70,6 +70,11 @@ #endif +#if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT) +#warn "minherit() is defined, but we couldn't find the right flag for it." +#warn "This is probably a bug in Tor's support for this platform." +#endif + /** * Helper: try to prevent the sz bytes at mem from being swapped * to disk. Return 0 on success or if the facility is not available on this ___ 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] Add a changes file for ticket 30686.
commit 5068ccab0b1849e836729c43a2ca891139cf107b Author: Nick Mathewson Date: Wed May 29 09:23:13 2019 -0400 Add a changes file for ticket 30686. --- changes/ticket30686 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket30686 b/changes/ticket30686 new file mode 100644 index 0..36473c1a0 --- /dev/null +++ b/changes/ticket30686 @@ -0,0 +1,5 @@ + o Minor features (logging): +- Give a more useful assertion failure message if we think we have + minherit() but we fail to make a region non-inheritable. Give a + compile-time warning if our support for minherit() is + incomplete. Closes ticket 30686. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Give a compile warning when we don't have any flags for minherit().
commit cad0de35bd49064f5712f32a2b6e41ffe6e822e6 Author: Nick Mathewson Date: Wed May 29 09:22:18 2019 -0400 Give a compile warning when we don't have any flags for minherit(). Part of ticket 30686. --- src/lib/malloc/map_anon.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index f4fda00bf..6afea713d 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -70,6 +70,11 @@ #endif +#if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT) +#warn "minherit() is defined, but we couldn't find the right flag for it." +#warn "This is probably a bug in Tor's support for this platform." +#endif + /** * Helper: try to prevent the sz bytes at mem from being swapped * to disk. Return 0 on success or if the facility is not available on this ___ 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'
commit 35dd2d733bf9db0eca83caab93111fbc0cc1673e Merge: 3405a311d ea14fb136 Author: David Goulet Date: Tue Jun 11 11:30:05 2019 -0400 Merge branch 'maint-0.4.1' changes/ticket30686 | 5 + src/lib/crypt_ops/crypto_rand_fast.c | 6 +- src/lib/malloc/map_anon.c| 5 + 3 files changed, 15 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'tor-github/pr/1050' into maint-0.4.1
commit ea14fb136c6c771320d7c4ff6beab05d1dbc73aa Merge: ce89fe36c 5068ccab0 Author: David Goulet Date: Tue Jun 11 11:29:46 2019 -0400 Merge branch 'tor-github/pr/1050' into maint-0.4.1 changes/ticket30686 | 5 + src/lib/crypt_ops/crypto_rand_fast.c | 6 +- src/lib/malloc/map_anon.c| 5 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --cc src/lib/crypt_ops/crypto_rand_fast.c index c7f71a17c,d2ce1a542..e6ceb42cc --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@@ -181,8 -181,12 +181,12 @@@ crypto_fast_rng_new_from_seed(const uin #else /* We decided above that noinherit would always do _something_. Assert here * that we were correct. */ - tor_assert(inherit != INHERIT_RES_KEEP); + tor_assertf(inherit != INHERIT_RES_KEEP, + "We failed to create a non-inheritable memory region, even " + "though we believed such a failure to be impossible! This is " + "probably a bug in Tor support for your platform; please report " + "it."); -#endif +#endif /* defined(CHECK_PID) || ... */ return result; } diff --cc src/lib/malloc/map_anon.c index 219bd706c,6afea713d..0f6a4150c --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@@ -72,8 -68,13 +72,13 @@@ #define FLAG_NOINHERIT MADV_DONTFORK #endif -#endif +#endif /* defined(HAVE_MINHERIT) || ... */ + #if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT) + #warn "minherit() is defined, but we couldn't find the right flag for it." + #warn "This is probably a bug in Tor's support for this platform." + #endif + /** * Helper: try to prevent the sz bytes at mem from being swapped * to disk. Return 0 on success or if the facility is not available on this ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Give a more useful failure messgae when we fail to minherit().
commit 93ddc51cbd325ef3d5cf3a5b9948ff65c09fc5aa Author: Nick Mathewson Date: Wed May 29 09:21:45 2019 -0400 Give a more useful failure messgae when we fail to minherit(). Part of ticket 30686. --- src/lib/crypt_ops/crypto_rand_fast.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/crypt_ops/crypto_rand_fast.c b/src/lib/crypt_ops/crypto_rand_fast.c index b71ade81b..d2ce1a542 100644 --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@ -181,7 +181,11 @@ crypto_fast_rng_new_from_seed(const uint8_t *seed) #else /* We decided above that noinherit would always do _something_. Assert here * that we were correct. */ - tor_assert(inherit != INHERIT_RES_KEEP); + tor_assertf(inherit != INHERIT_RES_KEEP, + "We failed to create a non-inheritable memory region, even " + "though we believed such a failure to be impossible! This is " + "probably a bug in Tor support for your platform; please report " + "it."); #endif return result; } ___ 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/1050' into maint-0.4.1
commit ea14fb136c6c771320d7c4ff6beab05d1dbc73aa Merge: ce89fe36c 5068ccab0 Author: David Goulet Date: Tue Jun 11 11:29:46 2019 -0400 Merge branch 'tor-github/pr/1050' into maint-0.4.1 changes/ticket30686 | 5 + src/lib/crypt_ops/crypto_rand_fast.c | 6 +- src/lib/malloc/map_anon.c| 5 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --cc src/lib/crypt_ops/crypto_rand_fast.c index c7f71a17c,d2ce1a542..e6ceb42cc --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@@ -181,8 -181,12 +181,12 @@@ crypto_fast_rng_new_from_seed(const uin #else /* We decided above that noinherit would always do _something_. Assert here * that we were correct. */ - tor_assert(inherit != INHERIT_RES_KEEP); + tor_assertf(inherit != INHERIT_RES_KEEP, + "We failed to create a non-inheritable memory region, even " + "though we believed such a failure to be impossible! This is " + "probably a bug in Tor support for your platform; please report " + "it."); -#endif +#endif /* defined(CHECK_PID) || ... */ return result; } diff --cc src/lib/malloc/map_anon.c index 219bd706c,6afea713d..0f6a4150c --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@@ -72,8 -68,13 +72,13 @@@ #define FLAG_NOINHERIT MADV_DONTFORK #endif -#endif +#endif /* defined(HAVE_MINHERIT) || ... */ + #if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT) + #warn "minherit() is defined, but we couldn't find the right flag for it." + #warn "This is probably a bug in Tor's support for this platform." + #endif + /** * Helper: try to prevent the sz bytes at mem from being swapped * to disk. Return 0 on success or if the facility is not available on this ___ 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] Give a more useful failure messgae when we fail to minherit().
commit 93ddc51cbd325ef3d5cf3a5b9948ff65c09fc5aa Author: Nick Mathewson Date: Wed May 29 09:21:45 2019 -0400 Give a more useful failure messgae when we fail to minherit(). Part of ticket 30686. --- src/lib/crypt_ops/crypto_rand_fast.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/crypt_ops/crypto_rand_fast.c b/src/lib/crypt_ops/crypto_rand_fast.c index b71ade81b..d2ce1a542 100644 --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@ -181,7 +181,11 @@ crypto_fast_rng_new_from_seed(const uint8_t *seed) #else /* We decided above that noinherit would always do _something_. Assert here * that we were correct. */ - tor_assert(inherit != INHERIT_RES_KEEP); + tor_assertf(inherit != INHERIT_RES_KEEP, + "We failed to create a non-inheritable memory region, even " + "though we believed such a failure to be impossible! This is " + "probably a bug in Tor support for your platform; please report " + "it."); #endif return result; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add a changes file for ticket 30686.
commit 5068ccab0b1849e836729c43a2ca891139cf107b Author: Nick Mathewson Date: Wed May 29 09:23:13 2019 -0400 Add a changes file for ticket 30686. --- changes/ticket30686 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket30686 b/changes/ticket30686 new file mode 100644 index 0..36473c1a0 --- /dev/null +++ b/changes/ticket30686 @@ -0,0 +1,5 @@ + o Minor features (logging): +- Give a more useful assertion failure message if we think we have + minherit() but we fail to make a region non-inheritable. Give a + compile-time warning if our support for minherit() is + incomplete. Closes ticket 30686. ___ 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] Give a compile warning when we don't have any flags for minherit().
commit cad0de35bd49064f5712f32a2b6e41ffe6e822e6 Author: Nick Mathewson Date: Wed May 29 09:22:18 2019 -0400 Give a compile warning when we don't have any flags for minherit(). Part of ticket 30686. --- src/lib/malloc/map_anon.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index f4fda00bf..6afea713d 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -70,6 +70,11 @@ #endif +#if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT) +#warn "minherit() is defined, but we couldn't find the right flag for it." +#warn "This is probably a bug in Tor's support for this platform." +#endif + /** * Helper: try to prevent the sz bytes at mem from being swapped * to disk. Return 0 on success or if the facility is not available on this ___ 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 'tor-github/pr/1050' into maint-0.4.1
commit ea14fb136c6c771320d7c4ff6beab05d1dbc73aa Merge: ce89fe36c 5068ccab0 Author: David Goulet Date: Tue Jun 11 11:29:46 2019 -0400 Merge branch 'tor-github/pr/1050' into maint-0.4.1 changes/ticket30686 | 5 + src/lib/crypt_ops/crypto_rand_fast.c | 6 +- src/lib/malloc/map_anon.c| 5 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --cc src/lib/crypt_ops/crypto_rand_fast.c index c7f71a17c,d2ce1a542..e6ceb42cc --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@@ -181,8 -181,12 +181,12 @@@ crypto_fast_rng_new_from_seed(const uin #else /* We decided above that noinherit would always do _something_. Assert here * that we were correct. */ - tor_assert(inherit != INHERIT_RES_KEEP); + tor_assertf(inherit != INHERIT_RES_KEEP, + "We failed to create a non-inheritable memory region, even " + "though we believed such a failure to be impossible! This is " + "probably a bug in Tor support for your platform; please report " + "it."); -#endif +#endif /* defined(CHECK_PID) || ... */ return result; } diff --cc src/lib/malloc/map_anon.c index 219bd706c,6afea713d..0f6a4150c --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@@ -72,8 -68,13 +72,13 @@@ #define FLAG_NOINHERIT MADV_DONTFORK #endif -#endif +#endif /* defined(HAVE_MINHERIT) || ... */ + #if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT) + #warn "minherit() is defined, but we couldn't find the right flag for it." + #warn "This is probably a bug in Tor's support for this platform." + #endif + /** * Helper: try to prevent the sz bytes at mem from being swapped * to disk. Return 0 on success or if the facility is not available on this ___ 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] Give a more useful failure messgae when we fail to minherit().
commit 93ddc51cbd325ef3d5cf3a5b9948ff65c09fc5aa Author: Nick Mathewson Date: Wed May 29 09:21:45 2019 -0400 Give a more useful failure messgae when we fail to minherit(). Part of ticket 30686. --- src/lib/crypt_ops/crypto_rand_fast.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/crypt_ops/crypto_rand_fast.c b/src/lib/crypt_ops/crypto_rand_fast.c index b71ade81b..d2ce1a542 100644 --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@ -181,7 +181,11 @@ crypto_fast_rng_new_from_seed(const uint8_t *seed) #else /* We decided above that noinherit would always do _something_. Assert here * that we were correct. */ - tor_assert(inherit != INHERIT_RES_KEEP); + tor_assertf(inherit != INHERIT_RES_KEEP, + "We failed to create a non-inheritable memory region, even " + "though we believed such a failure to be impossible! This is " + "probably a bug in Tor support for your platform; please report " + "it."); #endif return result; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Merge remote-tracking branch 'nickm/ticket29310'
commit 1978da4a5c9bcf3b90b5f4c6199f3486572898e4 Merge: 43c8b45 4907ce3 Author: David Goulet Date: Tue Jun 11 11:01:40 2019 -0400 Merge remote-tracking branch 'nickm/ticket29310' control-spec.txt | 8 1 file changed, 8 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Document GETINFO limits/max-mem-in-queues
commit 4907ce3725afaf5e8a7b08c592d2c97d359dd468 Author: Nick Mathewson Date: Thu May 16 15:45:14 2019 -0400 Document GETINFO limits/max-mem-in-queues --- control-spec.txt | 8 1 file changed, 8 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index eb3089b..ac6578a 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1131,6 +1131,14 @@ 0 or 1, depending on whether it is possible to use SAVECONF without the FORCE flag. (Introduced in 0.3.1.1-alpha.) +"limits/max-mem-in-queues" + The amount of memory that Tor's out-of-memory checker will allow + Tor to allocate (in places it can see) before it starts freeing memory + and killing circuits. See the MaxMemInQueues option for more + details. Unlike the option, this value reflects Tor's actual limit, and + may be adjusted depending on the available system memory rather than on + the MaxMemInQueues option. (Introduced in 0.2.5.4-alpha) + Examples: C: GETINFO version desc/name/moria1 S: 250+desc/name/moria= ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Tweak documentation of new(ly updated) graphs.
commit 3f252fce7f4c3bcfc1a1f53ca0c8f2ff9df31659 Author: Karsten Loesing Date: Tue Jun 11 16:36:06 2019 +0200 Tweak documentation of new(ly updated) graphs. --- src/main/resources/web/jsps/stats.jsp | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index 68c4114..5d653cb 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -50,6 +50,8 @@ https://metrics.torproject.org/identifier.csv October 28, 2018: Added and/or removed columns to Tor Browser downloads and updates by platform and Tor Browser downloads and updates by locale graphs. December 20, 2018: Removed source parameters and output rows with aggregates over all sources from Time to download files over Tor, Timeouts and failures of downloading files over Tor, Circuit build times, Circuit round-trip latencies graphs. December 20, 2018: Removed two graphs Total relay bandwidth and Consumed bandwidth by Exit/Guard flag combination, and updated the data format of the Advertised and consumed bandwidth by relay flags graph to cover all data previously contained in the first two graphs. +May 29, 2019: Extended Circuit round-trip latencies graph to contain high/low values. +June 2, 2019: Added Throughput graph. @@ -563,11 +565,11 @@ Performance # date: UTC date (-MM-DD) when download performance was measured. source: Name of the OnionPerf or Torperf service performing measurements. server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to a version 2 onion server. -low: Lowest latency within 1.5 IQR of lower quartile (lower whisker in a boxplot) of time in milliseconds between sending the HTTP request and receiving the HTTP response header. +low: Lowest time in milliseconds between sending the HTTP request and receiving the HTTP response header within 1.5 IQR of lower quartile (lower whisker in a boxplot). q1: First quartile of time in milliseconds between sending the HTTP request and receiving the HTTP response header. md: Median of time in milliseconds between sending the HTTP request and receiving the HTTP response header. q3: Third quartile of time in milliseconds between sending the HTTP request and receiving the HTTP response header. -high: Highest latency within 1.5 IQR of upper quartile (upper whisker in a boxplot) of time in milliseconds between sending the HTTP request and receiving the HTTP response header. +high: Highest time in milliseconds between sending the HTTP request and receiving the HTTP response header within 1.5 IQR of upper quartile (upper whisker in a boxplot). Throughput @@ -589,11 +591,11 @@ Performance # date: UTC date (-MM-DD) when download performance was measured. source: Name of the OnionPerf or Torperf service performing measurements. server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to a version 2 onion server. -low: Lowest measured throughput within 1.5 IQR of lower quartile (lower whisker in a boxplot) in kilobits per second. +low: Lowest measured throughput in kilobits per second within 1.5 IQR of lower quartile (lower whisker in a boxplot). q1: First quartile of measured throughput in kilobits per second. md: Median of measured throughput in kilobits per second. q3: Third quartile of measured throughput in kilobits per second. -high: Highest measured throughput within 1.5 IQR of upper quartile (upper whisker in a boxplot) in kilobits per second. +high: Highest measured throughput in kilobits per second within 1.5 IQR of upper quartile (upper whisker in a boxplot). ___ 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 b0fa1f4fb0b4f6a474b20e40e2810936c0577cc2 Merge: dcb8cad4e 0ec4ebd00 Author: Nick Mathewson Date: Tue Jun 11 10:17:17 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 ce89fe36c8d5e6210a2418430c91c3df03d86bdc Merge: 29842f68e afa2c39ba Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 b0fa1f4fb0b4f6a474b20e40e2810936c0577cc2 Merge: dcb8cad4e 0ec4ebd00 Author: Nick Mathewson Date: Tue Jun 11 10:17:17 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 38774cabb89ba83acdc1dc87ba7867254ae81496 Merge: eb7f55df8 b0fa1f4fb Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 2626081e1e9afe4400287e3981385129fff02e3a Merge: fc0fa1594 0ec4ebd00 Author: Nick Mathewson Date: Tue Jun 11 10:17:17 2019 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 ce89fe36c8d5e6210a2418430c91c3df03d86bdc Merge: 29842f68e afa2c39ba Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 a219449b9cd995cde9723ff9023f93cca181c060 Merge: 50dcbf261 afa2c39ba Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 b0fa1f4fb0b4f6a474b20e40e2810936c0577cc2 Merge: dcb8cad4e 0ec4ebd00 Author: Nick Mathewson Date: Tue Jun 11 10:17:17 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 afa2c39baa61777b7f5bdfed28efe2ac5087dc4b Merge: 4ca18fde9 b0fa1f4fb Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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'
commit 3405a311dacae2fa3391333f862fb853a84fc674 Merge: eb02c323e ce89fe36c Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.4.1' changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 afa2c39baa61777b7f5bdfed28efe2ac5087dc4b Merge: 4ca18fde9 b0fa1f4fb Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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.3.5' into maint-0.4.0
commit afa2c39baa61777b7f5bdfed28efe2ac5087dc4b Merge: 4ca18fde9 b0fa1f4fb Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 b0fa1f4fb0b4f6a474b20e40e2810936c0577cc2 Merge: dcb8cad4e 0ec4ebd00 Author: Nick Mathewson Date: Tue Jun 11 10:17:17 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 ce89fe36c8d5e6210a2418430c91c3df03d86bdc Merge: 29842f68e afa2c39ba Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 afa2c39baa61777b7f5bdfed28efe2ac5087dc4b Merge: 4ca18fde9 b0fa1f4fb Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 b0fa1f4fb0b4f6a474b20e40e2810936c0577cc2 Merge: dcb8cad4e 0ec4ebd00 Author: Nick Mathewson Date: Tue Jun 11 10:17:17 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 b0fa1f4fb0b4f6a474b20e40e2810936c0577cc2 Merge: dcb8cad4e 0ec4ebd00 Author: Nick Mathewson Date: Tue Jun 11 10:17:17 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 afa2c39baa61777b7f5bdfed28efe2ac5087dc4b Merge: 4ca18fde9 b0fa1f4fb Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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 b0fa1f4fb0b4f6a474b20e40e2810936c0577cc2 Merge: dcb8cad4e 0ec4ebd00 Author: Nick Mathewson Date: Tue Jun 11 10:17:17 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit 8f756e7ee38a68240933c3c5c09c4178da8b99a8 Author: Translation commit bot Date: Tue Jun 11 13:46:01 2019 + Update translations for https_everywhere --- fa/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index cc55887a9..5f4b63df7 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -35,7 +35,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 38f912efbafdb28af9da80fa2dccbe9d119d858b Author: Translation commit bot Date: Tue Jun 11 13:46:09 2019 + Update translations for https_everywhere_completed --- fa/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index 5f7f5f31f..5f4b63df7 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -35,6 +35,7 @@ + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_outreach_md] Update translations for tor_outreach_md
commit 43221e10fe42332e8646085456e13f811b171416 Author: Translation commit bot Date: Tue Jun 11 13:20:34 2019 + Update translations for tor_outreach_md --- tor-outreach2019-2020-ca.md | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tor-outreach2019-2020-ca.md b/tor-outreach2019-2020-ca.md index d3db8f6cc..2ebc17aa8 100644 --- a/tor-outreach2019-2020-ca.md +++ b/tor-outreach2019-2020-ca.md @@ -36,9 +36,9 @@ She also uses a Tor-powered app called **OnionShare** to send files to other act --- -# 3. TOR FOR HUMAN RIGHTS +# 3. TOR PER ALS DRETS HUMANS -### Water is life +### L'aigua és vida Jelani lives in a small village which a wide river runs through. @@ -58,7 +58,7 @@ All of this software uses Tor to help protect Jelaniâs privacy. --- -# 4. TOR FOR ANTI-CENSORSHIP +# 4. TOR PER A L'ANTICENSURA ### Build bridges not walls @@ -90,7 +90,7 @@ With Tor Browser, Jean can browse freely and privately and contact his family. --- -# 5. Shared Sections +# 5. Seccions compartides ## Què és Tor? @@ -103,7 +103,7 @@ When you use Tor Browser, no one can see what websites you visit or where in the Other applications, like SecureDrop and OnionShare, use Tor to protect their users against surveillance and censorship. -## 6. How does Tor work? +## 6. Com funciona Tor? Amal wants to visit Bekeleâs website privately, so she opens Tor Browser. @@ -121,13 +121,13 @@ The third relay removes the last encryption layer and forwards the web page requ Bekele doesn't know that the website request came from Amal unless she tells him so. -## 7. Who uses Tor? +## 7. Qui usa Tor? People all over the world use Tor to protect their privacy and access the web freely. Tor helps protect journalists, human rights defenders, domestic violence victims, academic researchers, and anyone experiencing tracking, censorship, or surveillance. -## 6. Why trust Tor? +## 6. Per què confiar en Tor? Tor is designed for privacy. We donât know who our users are, and we don't keep logs of user activity. @@ -135,7 +135,7 @@ Tor relay operators cannot reveal the true identity of Tor users. Continual peer review of Tor's source code by academic and open source communities ensures that there are no backdoors in Tor, and our social contract promises that we will never backdoor Tor. -## 7. Join the Tor community +## 7. Uniu-vos a la comunitat Tor is made possible by a diverse set of users, developers, relay operators, and advocates from around the world. @@ -148,13 +148,13 @@ The Tor community is governed by a code of conduct, and we outline our set of pr Learn more about Tor by visiting our website, our wiki, finding us on IRC, joining one of our mailing lists, or signing up for Tor News at newsletter.torproject.org. -## 8. Download Tor +## 8. Baixeu Tor -Tor for Desktop +Tor per a l'escriptori torproject.org/download -TOR ON MOBILE -### Android +TOR AL MÃBIL +### Android Tor Browser for Android is available from GooglePlay. ### iOS ___ 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 remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1
commit 29842f68e7a4f38d69509191fba9a7ffb28cdcd8 Merge: eab9dc06a b07b1a4f6 Author: Nick Mathewson Date: Tue Jun 11 08:41:48 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1 changes/bug30781 | 4 scripts/maint/practracker/exceptions.txt | 2 +- src/feature/dirparse/routerparse.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'bug30781_035' into bug30781_040
commit fb3f461406d9d22da3ce0b602409c6610b8bb4f7 Merge: 6a6f7eb67 c8c2e2b8f Author: teor Date: Thu Jun 6 09:56:50 2019 +1000 Merge branch 'bug30781_035' into bug30781_040 changes/bug30781 | 4 src/feature/dirparse/routerparse.c | 3 +++ 2 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/release-0.4.1] Merge branch 'bug30781_040' into bug30781_master
commit c7fc53c2e77f9931bc607a414e289dcebbcee516 Merge: 3c2b2f072 fb3f46140 Author: teor Date: Thu Jun 6 09:57:31 2019 +1000 Merge branch 'bug30781_040' into bug30781_master changes/bug30781 | 4 src/feature/dirparse/routerparse.c | 3 +++ 2 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/release-0.4.1] practracker: accept 3 extra lines in router_parse_entry_from_string()
commit b07b1a4f6d1aae3755db7ccfa9e7417214375f13 Author: teor Date: Thu Jun 6 13:42:30 2019 +1000 practracker: accept 3 extra lines in router_parse_entry_from_string() practracker exception for bug 30781. --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index eb0625b8d..db9bf34e2 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -189,7 +189,7 @@ problem function-size /src/feature/dirparse/ns_parse.c:networkstatus_verify_bw_w problem function-size /src/feature/dirparse/ns_parse.c:networkstatus_parse_vote_from_string() 638 problem function-size /src/feature/dirparse/parsecommon.c:tokenize_string() 103 problem function-size /src/feature/dirparse/parsecommon.c:get_next_token() 159 -problem function-size /src/feature/dirparse/routerparse.c:router_parse_entry_from_string() 554 +problem function-size /src/feature/dirparse/routerparse.c:router_parse_entry_from_string() 557 problem function-size /src/feature/dirparse/routerparse.c:extrainfo_parse_entry_from_string() 210 problem function-size /src/feature/hibernate/hibernate.c:accounting_parse_options() 109 problem function-size /src/feature/hs/hs_cell.c:hs_cell_build_establish_intro() 115 ___ 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] dirparse: Stop crashing when parsing unknown descriptor purpose annotations
commit ba83c1e5cf0e4ba0d63cb3728da059a9b241a161
Author: teor
Date: Thu Jun 6 09:12:14 2019 +1000
dirparse: Stop crashing when parsing unknown descriptor purpose annotations
We think this bug can only be triggered by modifying a local file.
Fixes bug 30781; bugfix on 0.2.0.8-alpha.
---
changes/bug30781 | 4
src/or/routerparse.c | 3 +++
2 files changed, 7 insertions(+)
diff --git a/changes/bug30781 b/changes/bug30781
new file mode 100644
index 0..7c7adf470
--- /dev/null
+++ b/changes/bug30781
@@ -0,0 +1,4 @@
+ o Minor bugfixes (directory authorities):
+- Stop crashing after parsing an unknown descriptor purpose annotation.
+ We think this bug can only be triggered by modifying a local file.
+ Fixes bug 30781; bugfix on 0.2.0.8-alpha.
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 37d2d975f..f046cc39b 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1921,6 +1921,9 @@ router_parse_entry_from_string(const char *s, const char
*end,
if ((tok = find_opt_by_keyword(tokens, A_PURPOSE))) {
tor_assert(tok->n_args);
router->purpose = router_purpose_from_string(tok->args[0]);
+if (router->purpose == ROUTER_PURPOSE_UNKNOWN) {
+ goto err;
+}
} else {
router->purpose = ROUTER_PURPOSE_GENERAL;
}
___
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] dirparse: Stop crashing when parsing unknown descriptor purpose annotations
commit ba83c1e5cf0e4ba0d63cb3728da059a9b241a161
Author: teor
Date: Thu Jun 6 09:12:14 2019 +1000
dirparse: Stop crashing when parsing unknown descriptor purpose annotations
We think this bug can only be triggered by modifying a local file.
Fixes bug 30781; bugfix on 0.2.0.8-alpha.
---
changes/bug30781 | 4
src/or/routerparse.c | 3 +++
2 files changed, 7 insertions(+)
diff --git a/changes/bug30781 b/changes/bug30781
new file mode 100644
index 0..7c7adf470
--- /dev/null
+++ b/changes/bug30781
@@ -0,0 +1,4 @@
+ o Minor bugfixes (directory authorities):
+- Stop crashing after parsing an unknown descriptor purpose annotation.
+ We think this bug can only be triggered by modifying a local file.
+ Fixes bug 30781; bugfix on 0.2.0.8-alpha.
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 37d2d975f..f046cc39b 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1921,6 +1921,9 @@ router_parse_entry_from_string(const char *s, const char
*end,
if ((tok = find_opt_by_keyword(tokens, A_PURPOSE))) {
tor_assert(tok->n_args);
router->purpose = router_purpose_from_string(tok->args[0]);
+if (router->purpose == ROUTER_PURPOSE_UNKNOWN) {
+ goto err;
+}
} else {
router->purpose = ROUTER_PURPOSE_GENERAL;
}
___
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 'bug30781_029' into bug30781_034
commit dc8e3cd5ce2affb849ed07db8b4a7788769c5935 Merge: a521c4278 ba83c1e5c Author: teor Date: Thu Jun 6 09:53:02 2019 +1000 Merge branch 'bug30781_029' into bug30781_034 changes/bug30781 | 4 src/or/routerparse.c | 3 +++ 2 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/release-0.4.1] Merge branch 'bug30781_034' into bug30781_035
commit c8c2e2b8fcc4d99adce600da8210a5e9ae653daf
Merge: e5deb2bbc dc8e3cd5c
Author: teor
Date: Thu Jun 6 09:55:44 2019 +1000
Merge branch 'bug30781_034' into bug30781_035
Moved fix from src/or/routerparse.c to src/feature/dirparse/routerparse.c.
changes/bug30781 | 4
src/feature/dirparse/routerparse.c | 3 +++
2 files changed, 7 insertions(+)
diff --cc src/feature/dirparse/routerparse.c
index a81930263,0..e44fbf77f
mode 100644,00..100644
--- a/src/feature/dirparse/routerparse.c
+++ b/src/feature/dirparse/routerparse.c
@@@ -1,1242 -1,0 +1,1245 @@@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2019, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file routerparse.c
+ * \brief Code to parse and validate router descriptors, consenus directories,
+ * and similar objects.
+ *
+ * The objects parsed by this module use a common text-based metaformat,
+ * documented in dir-spec.txt in torspec.git. This module is itself divided
+ * into two major kinds of function: code to handle the metaformat, and code
+ * to convert from particular instances of the metaformat into the
+ * objects that Tor uses.
+ *
+ * The generic parsing code works by calling a table-based tokenizer on the
+ * input string. Each token corresponds to a single line with a token, plus
+ * optional arguments on that line, plus an optional base-64 encoded object
+ * after that line. Each token has a definition in a table of token_rule_t
+ * entries that describes how many arguments it can take, whether it takes an
+ * object, how many times it may appear, whether it must appear first, and so
+ * on.
+ *
+ * The tokenizer function tokenize_string() converts its string input into a
+ * smartlist full of instances of directory_token_t, according to a provided
+ * table of token_rule_t.
+ *
+ * The generic parts of this module additionally include functions for
+ * finding the start and end of signed information inside a signed object, and
+ * computing the digest that will be signed.
+ *
+ * There are also functions for saving objects to disk that have caused
+ * parsing to fail.
+ *
+ * The specific parts of this module describe conversions between
+ * particular lists of directory_token_t and particular objects. The
+ * kinds of objects that can be parsed here are:
+ *
+ * router descriptors (managed from routerlist.c)
+ * extra-info documents (managed from routerlist.c)
+ * microdescriptors (managed from microdesc.c)
+ * vote and consensus networkstatus documents, and the routerstatus_t
+ *objects that they comprise (managed from networkstatus.c)
+ * detached-signature objects used by authorities for gathering
+ *signatures on the networkstatus consensus (managed from dirvote.c)
+ * authority key certificates (managed from routerlist.c)
+ * hidden service descriptors (managed from rendcommon.c and rendcache.c)
+ *
+ **/
+
+#define EXPOSE_ROUTERDESC_TOKEN_TABLE
+
+#include "core/or/or.h"
+#include "app/config/config.h"
+#include "core/or/policies.h"
+#include "core/or/versions.h"
+#include "feature/dirparse/parsecommon.h"
+#include "feature/dirparse/policy_parse.h"
+#include "feature/dirparse/routerparse.h"
+#include "feature/dirparse/sigcommon.h"
+#include "feature/dirparse/unparseable.h"
+#include "feature/nodelist/describe.h"
+#include "feature/nodelist/nickname.h"
+#include "feature/nodelist/routerinfo.h"
+#include "feature/nodelist/routerlist.h"
+#include "feature/nodelist/torcert.h"
+#include "feature/relay/router.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_format.h"
+#include "lib/memarea/memarea.h"
+#include "lib/sandbox/sandbox.h"
+
+#include "core/or/addr_policy_st.h"
+#include "feature/nodelist/extrainfo_st.h"
+#include "feature/nodelist/routerinfo_st.h"
+#include "feature/nodelist/routerlist_st.h"
+
+//
+
+/** List of tokens recognized in router descriptors */
+const token_rule_t routerdesc_token_table[] = {
+ T0N("reject", K_REJECT, ARGS,NO_OBJ ),
+ T0N("accept", K_ACCEPT, ARGS,NO_OBJ ),
+ T0N("reject6", K_REJECT6, ARGS,NO_OBJ ),
+ T0N("accept6", K_ACCEPT6, ARGS,NO_OBJ ),
+ T1_START( "router",K_ROUTER, GE(5), NO_OBJ ),
+ T01("ipv6-policy", K_IPV6_POLICY, CONCAT_ARGS, NO_OBJ),
+ T1( "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY_1024 ),
+ T1( "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY_1024 ),
+ T01("ntor-onion-key", K_ONION_KEY_NTOR, GE(1), NO_OBJ ),
+
[tor-commits] [tor/maint-0.4.1] Merge branch 'bug30781_040' into bug30781_master
commit c7fc53c2e77f9931bc607a414e289dcebbcee516 Merge: 3c2b2f072 fb3f46140 Author: teor Date: Thu Jun 6 09:57:31 2019 +1000 Merge branch 'bug30781_040' into bug30781_master changes/bug30781 | 4 src/feature/dirparse/routerparse.c | 3 +++ 2 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/release-0.4.1] Merge branch 'bug30781_029' into bug30781_034
commit dc8e3cd5ce2affb849ed07db8b4a7788769c5935 Merge: a521c4278 ba83c1e5c Author: teor Date: Thu Jun 6 09:53:02 2019 +1000 Merge branch 'bug30781_029' into bug30781_034 changes/bug30781 | 4 src/or/routerparse.c | 3 +++ 2 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 'maint-0.4.1'
commit eb02c323eb2e4b5db5039502be9fd93c0fd19d84 Merge: a7986755e 29842f68e Author: Nick Mathewson Date: Tue Jun 11 08:41:55 2019 -0400 Merge branch 'maint-0.4.1' changes/bug30781 | 4 scripts/maint/practracker/exceptions.txt | 2 +- src/feature/dirparse/routerparse.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.1] Merge branch 'bug30781_035' into bug30781_040
commit fb3f461406d9d22da3ce0b602409c6610b8bb4f7 Merge: 6a6f7eb67 c8c2e2b8f Author: teor Date: Thu Jun 6 09:56:50 2019 +1000 Merge branch 'bug30781_035' into bug30781_040 changes/bug30781 | 4 src/feature/dirparse/routerparse.c | 3 +++ 2 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 remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1
commit 29842f68e7a4f38d69509191fba9a7ffb28cdcd8 Merge: eab9dc06a b07b1a4f6 Author: Nick Mathewson Date: Tue Jun 11 08:41:48 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1 changes/bug30781 | 4 scripts/maint/practracker/exceptions.txt | 2 +- src/feature/dirparse/routerparse.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'bug30781_040' into bug30781_master
commit c7fc53c2e77f9931bc607a414e289dcebbcee516 Merge: 3c2b2f072 fb3f46140 Author: teor Date: Thu Jun 6 09:57:31 2019 +1000 Merge branch 'bug30781_040' into bug30781_master changes/bug30781 | 4 src/feature/dirparse/routerparse.c | 3 +++ 2 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 'bug30781_035' into bug30781_040
commit fb3f461406d9d22da3ce0b602409c6610b8bb4f7 Merge: 6a6f7eb67 c8c2e2b8f Author: teor Date: Thu Jun 6 09:56:50 2019 +1000 Merge branch 'bug30781_035' into bug30781_040 changes/bug30781 | 4 src/feature/dirparse/routerparse.c | 3 +++ 2 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] practracker: accept 3 extra lines in router_parse_entry_from_string()
commit b07b1a4f6d1aae3755db7ccfa9e7417214375f13 Author: teor Date: Thu Jun 6 13:42:30 2019 +1000 practracker: accept 3 extra lines in router_parse_entry_from_string() practracker exception for bug 30781. --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index eb0625b8d..db9bf34e2 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -189,7 +189,7 @@ problem function-size /src/feature/dirparse/ns_parse.c:networkstatus_verify_bw_w problem function-size /src/feature/dirparse/ns_parse.c:networkstatus_parse_vote_from_string() 638 problem function-size /src/feature/dirparse/parsecommon.c:tokenize_string() 103 problem function-size /src/feature/dirparse/parsecommon.c:get_next_token() 159 -problem function-size /src/feature/dirparse/routerparse.c:router_parse_entry_from_string() 554 +problem function-size /src/feature/dirparse/routerparse.c:router_parse_entry_from_string() 557 problem function-size /src/feature/dirparse/routerparse.c:extrainfo_parse_entry_from_string() 210 problem function-size /src/feature/hibernate/hibernate.c:accounting_parse_options() 109 problem function-size /src/feature/hs/hs_cell.c:hs_cell_build_establish_intro() 115 ___ 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 'bug30781_034' into bug30781_035
commit c8c2e2b8fcc4d99adce600da8210a5e9ae653daf
Merge: e5deb2bbc dc8e3cd5c
Author: teor
Date: Thu Jun 6 09:55:44 2019 +1000
Merge branch 'bug30781_034' into bug30781_035
Moved fix from src/or/routerparse.c to src/feature/dirparse/routerparse.c.
changes/bug30781 | 4
src/feature/dirparse/routerparse.c | 3 +++
2 files changed, 7 insertions(+)
diff --cc src/feature/dirparse/routerparse.c
index a81930263,0..e44fbf77f
mode 100644,00..100644
--- a/src/feature/dirparse/routerparse.c
+++ b/src/feature/dirparse/routerparse.c
@@@ -1,1242 -1,0 +1,1245 @@@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2019, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file routerparse.c
+ * \brief Code to parse and validate router descriptors, consenus directories,
+ * and similar objects.
+ *
+ * The objects parsed by this module use a common text-based metaformat,
+ * documented in dir-spec.txt in torspec.git. This module is itself divided
+ * into two major kinds of function: code to handle the metaformat, and code
+ * to convert from particular instances of the metaformat into the
+ * objects that Tor uses.
+ *
+ * The generic parsing code works by calling a table-based tokenizer on the
+ * input string. Each token corresponds to a single line with a token, plus
+ * optional arguments on that line, plus an optional base-64 encoded object
+ * after that line. Each token has a definition in a table of token_rule_t
+ * entries that describes how many arguments it can take, whether it takes an
+ * object, how many times it may appear, whether it must appear first, and so
+ * on.
+ *
+ * The tokenizer function tokenize_string() converts its string input into a
+ * smartlist full of instances of directory_token_t, according to a provided
+ * table of token_rule_t.
+ *
+ * The generic parts of this module additionally include functions for
+ * finding the start and end of signed information inside a signed object, and
+ * computing the digest that will be signed.
+ *
+ * There are also functions for saving objects to disk that have caused
+ * parsing to fail.
+ *
+ * The specific parts of this module describe conversions between
+ * particular lists of directory_token_t and particular objects. The
+ * kinds of objects that can be parsed here are:
+ *
+ * router descriptors (managed from routerlist.c)
+ * extra-info documents (managed from routerlist.c)
+ * microdescriptors (managed from microdesc.c)
+ * vote and consensus networkstatus documents, and the routerstatus_t
+ *objects that they comprise (managed from networkstatus.c)
+ * detached-signature objects used by authorities for gathering
+ *signatures on the networkstatus consensus (managed from dirvote.c)
+ * authority key certificates (managed from routerlist.c)
+ * hidden service descriptors (managed from rendcommon.c and rendcache.c)
+ *
+ **/
+
+#define EXPOSE_ROUTERDESC_TOKEN_TABLE
+
+#include "core/or/or.h"
+#include "app/config/config.h"
+#include "core/or/policies.h"
+#include "core/or/versions.h"
+#include "feature/dirparse/parsecommon.h"
+#include "feature/dirparse/policy_parse.h"
+#include "feature/dirparse/routerparse.h"
+#include "feature/dirparse/sigcommon.h"
+#include "feature/dirparse/unparseable.h"
+#include "feature/nodelist/describe.h"
+#include "feature/nodelist/nickname.h"
+#include "feature/nodelist/routerinfo.h"
+#include "feature/nodelist/routerlist.h"
+#include "feature/nodelist/torcert.h"
+#include "feature/relay/router.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_format.h"
+#include "lib/memarea/memarea.h"
+#include "lib/sandbox/sandbox.h"
+
+#include "core/or/addr_policy_st.h"
+#include "feature/nodelist/extrainfo_st.h"
+#include "feature/nodelist/routerinfo_st.h"
+#include "feature/nodelist/routerlist_st.h"
+
+//
+
+/** List of tokens recognized in router descriptors */
+const token_rule_t routerdesc_token_table[] = {
+ T0N("reject", K_REJECT, ARGS,NO_OBJ ),
+ T0N("accept", K_ACCEPT, ARGS,NO_OBJ ),
+ T0N("reject6", K_REJECT6, ARGS,NO_OBJ ),
+ T0N("accept6", K_ACCEPT6, ARGS,NO_OBJ ),
+ T1_START( "router",K_ROUTER, GE(5), NO_OBJ ),
+ T01("ipv6-policy", K_IPV6_POLICY, CONCAT_ARGS, NO_OBJ),
+ T1( "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY_1024 ),
+ T1( "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY_1024 ),
+ T01("ntor-onion-key", K_ONION_KEY_NTOR, GE(1), NO_OBJ ),
+
[tor-commits] [tor/maint-0.4.1] practracker: accept 3 extra lines in router_parse_entry_from_string()
commit b07b1a4f6d1aae3755db7ccfa9e7417214375f13 Author: teor Date: Thu Jun 6 13:42:30 2019 +1000 practracker: accept 3 extra lines in router_parse_entry_from_string() practracker exception for bug 30781. --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index eb0625b8d..db9bf34e2 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -189,7 +189,7 @@ problem function-size /src/feature/dirparse/ns_parse.c:networkstatus_verify_bw_w problem function-size /src/feature/dirparse/ns_parse.c:networkstatus_parse_vote_from_string() 638 problem function-size /src/feature/dirparse/parsecommon.c:tokenize_string() 103 problem function-size /src/feature/dirparse/parsecommon.c:get_next_token() 159 -problem function-size /src/feature/dirparse/routerparse.c:router_parse_entry_from_string() 554 +problem function-size /src/feature/dirparse/routerparse.c:router_parse_entry_from_string() 557 problem function-size /src/feature/dirparse/routerparse.c:extrainfo_parse_entry_from_string() 210 problem function-size /src/feature/hibernate/hibernate.c:accounting_parse_options() 109 problem function-size /src/feature/hs/hs_cell.c:hs_cell_build_establish_intro() 115 ___ 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 remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1
commit 29842f68e7a4f38d69509191fba9a7ffb28cdcd8 Merge: eab9dc06a b07b1a4f6 Author: Nick Mathewson Date: Tue Jun 11 08:41:48 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1 changes/bug30781 | 4 scripts/maint/practracker/exceptions.txt | 2 +- src/feature/dirparse/routerparse.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.1] Merge branch 'bug30781_034' into bug30781_035
commit c8c2e2b8fcc4d99adce600da8210a5e9ae653daf
Merge: e5deb2bbc dc8e3cd5c
Author: teor
Date: Thu Jun 6 09:55:44 2019 +1000
Merge branch 'bug30781_034' into bug30781_035
Moved fix from src/or/routerparse.c to src/feature/dirparse/routerparse.c.
changes/bug30781 | 4
src/feature/dirparse/routerparse.c | 3 +++
2 files changed, 7 insertions(+)
diff --cc src/feature/dirparse/routerparse.c
index a81930263,0..e44fbf77f
mode 100644,00..100644
--- a/src/feature/dirparse/routerparse.c
+++ b/src/feature/dirparse/routerparse.c
@@@ -1,1242 -1,0 +1,1245 @@@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2019, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file routerparse.c
+ * \brief Code to parse and validate router descriptors, consenus directories,
+ * and similar objects.
+ *
+ * The objects parsed by this module use a common text-based metaformat,
+ * documented in dir-spec.txt in torspec.git. This module is itself divided
+ * into two major kinds of function: code to handle the metaformat, and code
+ * to convert from particular instances of the metaformat into the
+ * objects that Tor uses.
+ *
+ * The generic parsing code works by calling a table-based tokenizer on the
+ * input string. Each token corresponds to a single line with a token, plus
+ * optional arguments on that line, plus an optional base-64 encoded object
+ * after that line. Each token has a definition in a table of token_rule_t
+ * entries that describes how many arguments it can take, whether it takes an
+ * object, how many times it may appear, whether it must appear first, and so
+ * on.
+ *
+ * The tokenizer function tokenize_string() converts its string input into a
+ * smartlist full of instances of directory_token_t, according to a provided
+ * table of token_rule_t.
+ *
+ * The generic parts of this module additionally include functions for
+ * finding the start and end of signed information inside a signed object, and
+ * computing the digest that will be signed.
+ *
+ * There are also functions for saving objects to disk that have caused
+ * parsing to fail.
+ *
+ * The specific parts of this module describe conversions between
+ * particular lists of directory_token_t and particular objects. The
+ * kinds of objects that can be parsed here are:
+ *
+ * router descriptors (managed from routerlist.c)
+ * extra-info documents (managed from routerlist.c)
+ * microdescriptors (managed from microdesc.c)
+ * vote and consensus networkstatus documents, and the routerstatus_t
+ *objects that they comprise (managed from networkstatus.c)
+ * detached-signature objects used by authorities for gathering
+ *signatures on the networkstatus consensus (managed from dirvote.c)
+ * authority key certificates (managed from routerlist.c)
+ * hidden service descriptors (managed from rendcommon.c and rendcache.c)
+ *
+ **/
+
+#define EXPOSE_ROUTERDESC_TOKEN_TABLE
+
+#include "core/or/or.h"
+#include "app/config/config.h"
+#include "core/or/policies.h"
+#include "core/or/versions.h"
+#include "feature/dirparse/parsecommon.h"
+#include "feature/dirparse/policy_parse.h"
+#include "feature/dirparse/routerparse.h"
+#include "feature/dirparse/sigcommon.h"
+#include "feature/dirparse/unparseable.h"
+#include "feature/nodelist/describe.h"
+#include "feature/nodelist/nickname.h"
+#include "feature/nodelist/routerinfo.h"
+#include "feature/nodelist/routerlist.h"
+#include "feature/nodelist/torcert.h"
+#include "feature/relay/router.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_format.h"
+#include "lib/memarea/memarea.h"
+#include "lib/sandbox/sandbox.h"
+
+#include "core/or/addr_policy_st.h"
+#include "feature/nodelist/extrainfo_st.h"
+#include "feature/nodelist/routerinfo_st.h"
+#include "feature/nodelist/routerlist_st.h"
+
+//
+
+/** List of tokens recognized in router descriptors */
+const token_rule_t routerdesc_token_table[] = {
+ T0N("reject", K_REJECT, ARGS,NO_OBJ ),
+ T0N("accept", K_ACCEPT, ARGS,NO_OBJ ),
+ T0N("reject6", K_REJECT6, ARGS,NO_OBJ ),
+ T0N("accept6", K_ACCEPT6, ARGS,NO_OBJ ),
+ T1_START( "router",K_ROUTER, GE(5), NO_OBJ ),
+ T01("ipv6-policy", K_IPV6_POLICY, CONCAT_ARGS, NO_OBJ),
+ T1( "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY_1024 ),
+ T1( "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY_1024 ),
+ T01("ntor-onion-key", K_ONION_KEY_NTOR, GE(1), NO_OBJ ),
+
[tor-commits] [tor/master] Merge branch 'bug30781_029' into bug30781_034
commit dc8e3cd5ce2affb849ed07db8b4a7788769c5935 Merge: a521c4278 ba83c1e5c Author: teor Date: Thu Jun 6 09:53:02 2019 +1000 Merge branch 'bug30781_029' into bug30781_034 changes/bug30781 | 4 src/or/routerparse.c | 3 +++ 2 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] dirparse: Stop crashing when parsing unknown descriptor purpose annotations
commit ba83c1e5cf0e4ba0d63cb3728da059a9b241a161
Author: teor
Date: Thu Jun 6 09:12:14 2019 +1000
dirparse: Stop crashing when parsing unknown descriptor purpose annotations
We think this bug can only be triggered by modifying a local file.
Fixes bug 30781; bugfix on 0.2.0.8-alpha.
---
changes/bug30781 | 4
src/or/routerparse.c | 3 +++
2 files changed, 7 insertions(+)
diff --git a/changes/bug30781 b/changes/bug30781
new file mode 100644
index 0..7c7adf470
--- /dev/null
+++ b/changes/bug30781
@@ -0,0 +1,4 @@
+ o Minor bugfixes (directory authorities):
+- Stop crashing after parsing an unknown descriptor purpose annotation.
+ We think this bug can only be triggered by modifying a local file.
+ Fixes bug 30781; bugfix on 0.2.0.8-alpha.
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 37d2d975f..f046cc39b 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1921,6 +1921,9 @@ router_parse_entry_from_string(const char *s, const char
*end,
if ((tok = find_opt_by_keyword(tokens, A_PURPOSE))) {
tor_assert(tok->n_args);
router->purpose = router_purpose_from_string(tok->args[0]);
+if (router->purpose == ROUTER_PURPOSE_UNKNOWN) {
+ goto err;
+}
} else {
router->purpose = ROUTER_PURPOSE_GENERAL;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Check whether gcc-hardening is runnable, and log an error if not
commit 66eae4afffb35afe891ec14a3389a484ecb7b373 Author: Nick Mathewson Date: Wed May 29 16:08:33 2019 -0400 Check whether gcc-hardening is runnable, and log an error if not Closes ticket 27530. --- changes/ticket27530 | 4 configure.ac| 11 +++ 2 files changed, 15 insertions(+) diff --git a/changes/ticket27530 b/changes/ticket27530 new file mode 100644 index 0..8ae4f5266 --- /dev/null +++ b/changes/ticket27530 @@ -0,0 +1,4 @@ + o Minor features (compilation): +- Log a more useful error message when we are compiling and one of the + compile-time hardening options we have selected can be linked but + not executed. Closes ticket 27530. diff --git a/configure.ac b/configure.ac index e7f959f17..1ecf82c66 100644 --- a/configure.ac +++ b/configure.ac @@ -1188,6 +1188,17 @@ m4_ifdef([AS_VAR_IF],[ TOR_CHECK_LDFLAGS(-pie, "$all_ldflags_for_check", "$all_libs_for_check") fi TOR_TRY_COMPILE_WITH_CFLAGS(-fwrapv, also_link, CFLAGS_FWRAPV="-fwrapv", true) + + AC_MSG_CHECKING([whether we can run hardened binaries]) + AC_RUN_IFELSE([AC_LANG_PROGRAM([], [return 0;])], +[AC_MSG_RESULT([yes])], +[AC_MSG_RESULT([no]) + AC_MSG_ERROR([dnl + We can link with compiler hardening options, but we can't run with them. + That's a bad sign! If you must, you can pass --disable-gcc-hardening to + configure, but it would be better to figure out what the underlying problem + is.])], +[AC_MSG_RESULT([cross])]) fi if test "$fragile_hardening" = "yes"; then ___ 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/1060'
commit a7986755eee19b948c46f0b43ad3f6174071bd79 Merge: e5ad6fb09 66eae4aff Author: George Kadianakis Date: Tue Jun 11 14:12:22 2019 +0300 Merge branch 'tor-github/pr/1060' changes/ticket27530 | 4 configure.ac| 11 +++ 2 files changed, 15 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] trunnel: Rename sendme.trunnel to sendme_cell.trunnel
commit c1359b32a43b09be96e0388c12b75a9deda17e4f
Author: David Goulet
Date: Wed Jun 5 09:57:52 2019 -0400
trunnel: Rename sendme.trunnel to sendme_cell.trunnel
This is to avoid having two sendme.{c|h} in the repository since the
subsystem
is implemented in src/core/or/sendme.{c|h}.
Fixes #30769
Signed-off-by: David Goulet
---
changes/ticket30769 | 4
src/core/or/sendme.c| 2 +-
src/ext/trunnel/trunnel-impl.h | 2 +-
src/ext/trunnel/trunnel.c | 2 +-
src/ext/trunnel/trunnel.h | 2 +-
src/trunnel/channelpadding_negotiation.c| 2 +-
src/trunnel/channelpadding_negotiation.h| 2 +-
src/trunnel/circpad_negotiation.c | 2 +-
src/trunnel/circpad_negotiation.h | 2 +-
src/trunnel/ed25519_cert.c | 2 +-
src/trunnel/ed25519_cert.h | 2 +-
src/trunnel/hs/cell_common.c| 2 +-
src/trunnel/hs/cell_common.h| 2 +-
src/trunnel/hs/cell_establish_intro.c | 2 +-
src/trunnel/hs/cell_establish_intro.h | 2 +-
src/trunnel/hs/cell_introduce1.c| 2 +-
src/trunnel/hs/cell_introduce1.h| 2 +-
src/trunnel/hs/cell_rendezvous.c| 2 +-
src/trunnel/hs/cell_rendezvous.h| 2 +-
src/trunnel/include.am | 6 +++---
src/trunnel/link_handshake.c| 2 +-
src/trunnel/link_handshake.h| 2 +-
src/trunnel/netinfo.c | 2 +-
src/trunnel/netinfo.h | 2 +-
src/trunnel/pwbox.c | 2 +-
src/trunnel/pwbox.h | 2 +-
src/trunnel/{sendme.c => sendme_cell.c} | 8
src/trunnel/{sendme.h => sendme_cell.h} | 6 +++---
src/trunnel/{sendme.trunnel => sendme_cell.trunnel} | 0
src/trunnel/socks5.c| 2 +-
src/trunnel/socks5.h| 2 +-
31 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/changes/ticket30769 b/changes/ticket30769
new file mode 100644
index 0..74f63a146
--- /dev/null
+++ b/changes/ticket30769
@@ -0,0 +1,4 @@
+ o Minor bugfixes (sendme, code structure):
+- Rename the trunnel SENDME file definition from sendme.trunnel to
+ sendme_cell.trunnel to avoid having twice sendme.{c|h} in the repository.
+ Fixes bug 30769; bugfix on 0.4.1.1-alpha.
diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c
index 47ac95f3c..0757ce3d5 100644
--- a/src/core/or/sendme.c
+++ b/src/core/or/sendme.c
@@ -23,7 +23,7 @@
#include "core/or/sendme.h"
#include "feature/nodelist/networkstatus.h"
#include "lib/ctime/di_ops.h"
-#include "trunnel/sendme.h"
+#include "trunnel/sendme_cell.h"
/* Return the minimum version given by the consensus (if any) that should be
* used when emitting a SENDME cell. */
diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index 15d1c8633..52afa9ccd 100644
--- a/src/ext/trunnel/trunnel-impl.h
+++ b/src/ext/trunnel/trunnel-impl.h
@@ -1,4 +1,4 @@
-/* trunnel-impl.h -- copied from Trunnel v1.5.2
+/* trunnel-impl.h -- copied from Trunnel v1.5.3
* https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file.
*/
diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index 3ae3fe02c..01a55c5be 100644
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -1,4 +1,4 @@
-/* trunnel.c -- copied from Trunnel v1.5.2
+/* trunnel.c -- copied from Trunnel v1.5.3
* https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file.
*/
diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h
index 9b708437b..87c75f4ec 100644
--- a/src/ext/trunnel/trunnel.h
+++ b/src/ext/trunnel/trunnel.h
@@ -1,4 +1,4 @@
-/* trunnel.h -- copied from Trunnel v1.5.2
+/* trunnel.h -- copied from Trunnel v1.5.3
* https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file.
*/
diff --git a/src/trunnel/channelpadding_negotiation.c
b/src/trunnel/channelpadding_negotiation.c
index 59e6b3838..d96496e90 100644
--- a/src/trunnel/channelpadding_negotiation.c
+++ b/src/trunnel/channelpadding_negotiation.c
@@ -1,4 +1,4 @@
-/* channelpadding_negotiation.c -- generated by Trunnel v1.5.2.
+/* channelpadding_negotiation.c -- generated by Trunnel v1.5.3.
* https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file.
*/
diff --git a/src/trunnel/channelpadding_negotiation.h
b/src/trunnel/channelpadding_negotiation.h
index fcfc232fe..3f96174f6 100644
--- a/src/trunnel/channelpadding_negotiation.h
+++ b/src/trunnel/channelpadding_negotiation.h
@@ -1,4 +1,4 @@
-/*
[tor-commits] [tor/master] Merge branch 'ticket30769_041_01'
commit e5ad6fb09298eff0bf8ebf0c3729602b91c3d9df
Merge: 646f7a9a9 c1359b32a
Author: George Kadianakis
Date: Tue Jun 11 14:11:24 2019 +0300
Merge branch 'ticket30769_041_01'
changes/ticket30769 | 4
src/core/or/sendme.c| 2 +-
src/ext/trunnel/trunnel-impl.h | 2 +-
src/ext/trunnel/trunnel.c | 2 +-
src/ext/trunnel/trunnel.h | 2 +-
src/trunnel/channelpadding_negotiation.c| 2 +-
src/trunnel/channelpadding_negotiation.h| 2 +-
src/trunnel/circpad_negotiation.c | 2 +-
src/trunnel/circpad_negotiation.h | 2 +-
src/trunnel/ed25519_cert.c | 2 +-
src/trunnel/ed25519_cert.h | 2 +-
src/trunnel/hs/cell_common.c| 2 +-
src/trunnel/hs/cell_common.h| 2 +-
src/trunnel/hs/cell_establish_intro.c | 2 +-
src/trunnel/hs/cell_establish_intro.h | 2 +-
src/trunnel/hs/cell_introduce1.c| 2 +-
src/trunnel/hs/cell_introduce1.h| 2 +-
src/trunnel/hs/cell_rendezvous.c| 2 +-
src/trunnel/hs/cell_rendezvous.h| 2 +-
src/trunnel/include.am | 6 +++---
src/trunnel/link_handshake.c| 2 +-
src/trunnel/link_handshake.h| 2 +-
src/trunnel/netinfo.c | 2 +-
src/trunnel/netinfo.h | 2 +-
src/trunnel/pwbox.c | 2 +-
src/trunnel/pwbox.h | 2 +-
src/trunnel/{sendme.c => sendme_cell.c} | 8
src/trunnel/{sendme.h => sendme_cell.h} | 6 +++---
src/trunnel/{sendme.trunnel => sendme_cell.trunnel} | 0
src/trunnel/socks5.c| 2 +-
src/trunnel/socks5.h| 2 +-
31 files changed, 40 insertions(+), 36 deletions(-)
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] token-bucket: Implement a single counter object
commit 7cf9d54e6d7a08f169a27f7d76731e61ebe63fb0
Author: David Goulet
Date: Wed May 29 11:34:07 2019 -0400
token-bucket: Implement a single counter object
Closes #30687.
Signed-off-by: David Goulet
---
changes/ticket30687 | 3 +
src/lib/evloop/token_bucket.c | 52 +++
src/lib/evloop/token_bucket.h | 29
src/test/include.am | 1 +
src/test/test.c | 1 +
src/test/test.h | 1 +
src/test/test_token_bucket.c | 152 ++
7 files changed, 239 insertions(+)
diff --git a/changes/ticket30687 b/changes/ticket30687
new file mode 100644
index 0..c3124eb64
--- /dev/null
+++ b/changes/ticket30687
@@ -0,0 +1,3 @@
+ o Minor feature (token bucket):
+- Implement a generic token bucket that uses a single counter. This will be
+ useful for the anti-DoS onion service work. Closes ticket 30687.
diff --git a/src/lib/evloop/token_bucket.c b/src/lib/evloop/token_bucket.c
index ee6d631e3..ec62d1b01 100644
--- a/src/lib/evloop/token_bucket.c
+++ b/src/lib/evloop/token_bucket.c
@@ -256,3 +256,55 @@ token_bucket_rw_dec(token_bucket_rw_t *bucket,
flags |= TB_WRITE;
return flags;
}
+
+/** Initialize a token bucket in bucket, set up to allow rate
+ * per second, with a maximum burst of burst. The bucket is created
+ * such that now_ts is the current timestamp. The bucket starts out
+ * full. */
+void
+token_bucket_ctr_init(token_bucket_ctr_t *bucket, uint32_t rate,
+ uint32_t burst, uint32_t now_ts)
+{
+ memset(bucket, 0, sizeof(token_bucket_ctr_t));
+ token_bucket_ctr_adjust(bucket, rate, burst);
+ token_bucket_ctr_reset(bucket, now_ts);
+}
+
+/** Change the configured rate and burst of the given token bucket object in
+ * bucket. */
+void
+token_bucket_ctr_adjust(token_bucket_ctr_t *bucket, uint32_t rate,
+uint32_t burst)
+{
+ token_bucket_cfg_init(>cfg, rate, burst);
+ token_bucket_raw_adjust(>counter, >cfg);
+}
+
+/** Reset bucket to be full, as of timestamp now_ts. */
+void
+token_bucket_ctr_reset(token_bucket_ctr_t *bucket, uint32_t now_ts)
+{
+ token_bucket_raw_reset(>counter, >cfg);
+ bucket->last_refilled_at_timestamp = now_ts;
+}
+
+/** Refill bucket as appropriate, given that the current timestamp is
+ * now_ts. */
+void
+token_bucket_ctr_refill(token_bucket_ctr_t *bucket, uint32_t now_ts)
+{
+ const uint32_t elapsed_ticks =
+(now_ts - bucket->last_refilled_at_timestamp);
+ if (elapsed_ticks > UINT32_MAX-(300*1000)) {
+/* Either about 48 days have passed since the last refill, or the
+ * monotonic clock has somehow moved backwards. (We're looking at you,
+ * Windows.). We accept up to a 5 minute jump backwards as
+ * "unremarkable".
+ */
+return;
+ }
+
+ token_bucket_raw_refill_steps(>counter, >cfg,
+elapsed_ticks);
+ bucket->last_refilled_at_timestamp = now_ts;
+}
diff --git a/src/lib/evloop/token_bucket.h b/src/lib/evloop/token_bucket.h
index 9398d2baa..35b4246b1 100644
--- a/src/lib/evloop/token_bucket.h
+++ b/src/lib/evloop/token_bucket.h
@@ -103,6 +103,35 @@ token_bucket_rw_get_write(const token_bucket_rw_t *bucket)
return token_bucket_raw_get(>write_bucket);
}
+/**
+ * A specialized bucket containing a single counter.
+ */
+
+typedef struct token_bucket_ctr_t {
+ token_bucket_cfg_t cfg;
+ token_bucket_raw_t counter;
+ uint32_t last_refilled_at_timestamp;
+} token_bucket_ctr_t;
+
+void token_bucket_ctr_init(token_bucket_ctr_t *bucket, uint32_t rate,
+ uint32_t burst, uint32_t now_ts);
+void token_bucket_ctr_adjust(token_bucket_ctr_t *bucket, uint32_t rate,
+ uint32_t burst);
+void token_bucket_ctr_reset(token_bucket_ctr_t *bucket, uint32_t now_ts);
+void token_bucket_ctr_refill(token_bucket_ctr_t *bucket, uint32_t now_ts);
+
+static inline bool
+token_bucket_ctr_dec(token_bucket_ctr_t *bucket, ssize_t n)
+{
+ return token_bucket_raw_dec(>counter, n);
+}
+
+static inline size_t
+token_bucket_ctr_get(const token_bucket_ctr_t *bucket)
+{
+ return token_bucket_raw_get(>counter);
+}
+
#ifdef TOKEN_BUCKET_PRIVATE
/* To avoid making the rates too small, we consider units of "steps",
diff --git a/src/test/include.am b/src/test/include.am
index 85f9c9f88..624bca66d 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -193,6 +193,7 @@ src_test_test_SOURCES += \
src/test/test_status.c \
src/test/test_storagedir.c \
src/test/test_threads.c \
+ src/test/test_token_bucket.c \
src/test/test_tortls.c \
src/test/test_util.c \
src/test/test_util_format.c \
diff --git a/src/test/test.c b/src/test/test.c
index cac98dd83..cc0853170 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -916,6 +916,7 @@ struct testgroup_t testgroups[] = {
{ "socks/", socks_tests },
{ "status/" , status_tests },
{ "storagedir/",
[tor-commits] [tor/master] Merge branch 'ticket30687_042_01'
commit 646f7a9a94db1837f0c4a1c2ab7bc0b10736a82d Merge: b83dba7cb 7cf9d54e6 Author: George Kadianakis Date: Tue Jun 11 14:02:33 2019 +0300 Merge branch 'ticket30687_042_01' changes/ticket30687 | 3 + src/lib/evloop/token_bucket.c | 52 +++ src/lib/evloop/token_bucket.h | 29 src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_token_bucket.c | 152 ++ 7 files changed, 239 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.1] Merge branch 'tor-github/pr/1065' into maint-0.4.1
commit eab9dc06af32ceb3826d068cf5bc55db68ad6c61 Merge: 2779ce1f6 3c3158f18 Author: George Kadianakis Date: Tue Jun 11 13:48:10 2019 +0300 Merge branch 'tor-github/pr/1065' into maint-0.4.1 changes/bug22619| 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12 +--- 3 files changed, 9 insertions(+), 8 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] Fix some tests for CL_PORT_NO_STREAM_OPTIONS
commit 3c3158f1826826d9b4e8841bc67855cca0fc883b
Author: Nick Mathewson
Date: Fri May 31 09:03:16 2019 -0400
Fix some tests for CL_PORT_NO_STREAM_OPTIONS
The comment in the tests was correct: this option _was_ inverted wrt
SessionGroup=.
---
src/test/test_config.c | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/test/test_config.c b/src/test/test_config.c
index c342d8cca..0de6b1291 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4568,16 +4568,14 @@ test_config_parse_port_config__ports__ports_given(void
*data)
"127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
tt_int_op(ret, OP_EQ, -1);
- // TODO: this seems wrong. Shouldn't it be the other way around?
- // Potential bug.
- // Test failure for a SessionGroup argument with valid value but with stream
- // options allowed
+ // Test failure for a SessionGroup argument with valid value but with no
+ // stream options allowed
config_free_lines(config_port_invalid); config_port_invalid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
smartlist_clear(slout);
config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123");
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
- "127.0.0.44", 0, 0);
+ "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
tt_int_op(ret, OP_EQ, -1);
// Test failure for more than one SessionGroup argument
@@ -4587,7 +4585,7 @@ test_config_parse_port_config__ports__ports_given(void
*data)
config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123 "
"SessionGroup=321");
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
- "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
+ "127.0.0.44", 0, 0);
tt_int_op(ret, OP_EQ, -1);
// Test success with a sessiongroup options
@@ -4596,7 +4594,7 @@ test_config_parse_port_config__ports__ports_given(void
*data)
smartlist_clear(slout);
config_port_valid = mock_config_line("DNSPort", "42 SessionGroup=122");
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
- "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
+ "127.0.0.44", 0, 0);
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix some tests for CL_PORT_NO_STREAM_OPTIONS
commit 3c3158f1826826d9b4e8841bc67855cca0fc883b
Author: Nick Mathewson
Date: Fri May 31 09:03:16 2019 -0400
Fix some tests for CL_PORT_NO_STREAM_OPTIONS
The comment in the tests was correct: this option _was_ inverted wrt
SessionGroup=.
---
src/test/test_config.c | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/test/test_config.c b/src/test/test_config.c
index c342d8cca..0de6b1291 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4568,16 +4568,14 @@ test_config_parse_port_config__ports__ports_given(void
*data)
"127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
tt_int_op(ret, OP_EQ, -1);
- // TODO: this seems wrong. Shouldn't it be the other way around?
- // Potential bug.
- // Test failure for a SessionGroup argument with valid value but with stream
- // options allowed
+ // Test failure for a SessionGroup argument with valid value but with no
+ // stream options allowed
config_free_lines(config_port_invalid); config_port_invalid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
smartlist_clear(slout);
config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123");
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
- "127.0.0.44", 0, 0);
+ "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
tt_int_op(ret, OP_EQ, -1);
// Test failure for more than one SessionGroup argument
@@ -4587,7 +4585,7 @@ test_config_parse_port_config__ports__ports_given(void
*data)
config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123 "
"SessionGroup=321");
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
- "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
+ "127.0.0.44", 0, 0);
tt_int_op(ret, OP_EQ, -1);
// Test success with a sessiongroup options
@@ -4596,7 +4594,7 @@ test_config_parse_port_config__ports__ports_given(void
*data)
smartlist_clear(slout);
config_port_valid = mock_config_line("DNSPort", "42 SessionGroup=122");
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
- "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
+ "127.0.0.44", 0, 0);
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'tor-github/pr/1065' into maint-0.4.1
commit eab9dc06af32ceb3826d068cf5bc55db68ad6c61 Merge: 2779ce1f6 3c3158f18 Author: George Kadianakis Date: Tue Jun 11 13:48:10 2019 +0300 Merge branch 'tor-github/pr/1065' into maint-0.4.1 changes/bug22619| 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12 +--- 3 files changed, 9 insertions(+), 8 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] Fix some tests for CL_PORT_NO_STREAM_OPTIONS
commit 3c3158f1826826d9b4e8841bc67855cca0fc883b
Author: Nick Mathewson
Date: Fri May 31 09:03:16 2019 -0400
Fix some tests for CL_PORT_NO_STREAM_OPTIONS
The comment in the tests was correct: this option _was_ inverted wrt
SessionGroup=.
---
src/test/test_config.c | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/test/test_config.c b/src/test/test_config.c
index c342d8cca..0de6b1291 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4568,16 +4568,14 @@ test_config_parse_port_config__ports__ports_given(void
*data)
"127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
tt_int_op(ret, OP_EQ, -1);
- // TODO: this seems wrong. Shouldn't it be the other way around?
- // Potential bug.
- // Test failure for a SessionGroup argument with valid value but with stream
- // options allowed
+ // Test failure for a SessionGroup argument with valid value but with no
+ // stream options allowed
config_free_lines(config_port_invalid); config_port_invalid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
smartlist_clear(slout);
config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123");
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
- "127.0.0.44", 0, 0);
+ "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
tt_int_op(ret, OP_EQ, -1);
// Test failure for more than one SessionGroup argument
@@ -4587,7 +4585,7 @@ test_config_parse_port_config__ports__ports_given(void
*data)
config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123 "
"SessionGroup=321");
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
- "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
+ "127.0.0.44", 0, 0);
tt_int_op(ret, OP_EQ, -1);
// Test success with a sessiongroup options
@@ -4596,7 +4594,7 @@ test_config_parse_port_config__ports__ports_given(void
*data)
smartlist_clear(slout);
config_port_valid = mock_config_line("DNSPort", "42 SessionGroup=122");
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
- "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
+ "127.0.0.44", 0, 0);
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.1'
commit b83dba7cb0dbd96c2be09edab47e6c16491c0a14 Merge: ece5133e0 eab9dc06a Author: George Kadianakis Date: Tue Jun 11 13:48:16 2019 +0300 Merge branch 'maint-0.4.1' changes/bug22619| 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12 +--- 3 files changed, 9 insertions(+), 8 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 'tor-github/pr/1065' into maint-0.4.1
commit eab9dc06af32ceb3826d068cf5bc55db68ad6c61 Merge: 2779ce1f6 3c3158f18 Author: George Kadianakis Date: Tue Jun 11 13:48:10 2019 +0300 Merge branch 'tor-github/pr/1065' into maint-0.4.1 changes/bug22619| 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12 +--- 3 files changed, 9 insertions(+), 8 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] Fix a logic error in deciding whether to accept SessionGroup=
commit 70b85358afd0a8d4291489f9e9f5654ab2d53371
Author: Nick Mathewson
Date: Fri May 31 08:26:10 2019 -0400
Fix a logic error in deciding whether to accept SessionGroup=
Fixes bug 22619; bugfix on 0.2.7.2-alpha
---
changes/bug22619| 3 +++
src/app/config/config.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changes/bug22619 b/changes/bug22619
new file mode 100644
index 0..9c71996f5
--- /dev/null
+++ b/changes/bug22619
@@ -0,0 +1,3 @@
+ o Minor bugfixes (circuit isolation):
+- Fix a logic error that prevented the SessionGroup sub-option from
+ being accepted. Fixes bug 22619; bugfix on 0.2.7.2-alpha.
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 2a504d306..352559759 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -7080,7 +7080,7 @@ parse_port_config(smartlist_t *out,
if (!strcasecmpstart(elt, "SessionGroup=")) {
int group = (int)tor_parse_long(elt+strlen("SessionGroup="),
10, 0, INT_MAX, , NULL);
- if (!ok || !allow_no_stream_options) {
+ if (!ok || allow_no_stream_options) {
log_warn(LD_CONFIG, "Invalid %sPort option '%s'",
portname, escaped(elt));
goto err;
___
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] Fix a logic error in deciding whether to accept SessionGroup=
commit 70b85358afd0a8d4291489f9e9f5654ab2d53371
Author: Nick Mathewson
Date: Fri May 31 08:26:10 2019 -0400
Fix a logic error in deciding whether to accept SessionGroup=
Fixes bug 22619; bugfix on 0.2.7.2-alpha
---
changes/bug22619| 3 +++
src/app/config/config.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changes/bug22619 b/changes/bug22619
new file mode 100644
index 0..9c71996f5
--- /dev/null
+++ b/changes/bug22619
@@ -0,0 +1,3 @@
+ o Minor bugfixes (circuit isolation):
+- Fix a logic error that prevented the SessionGroup sub-option from
+ being accepted. Fixes bug 22619; bugfix on 0.2.7.2-alpha.
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 2a504d306..352559759 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -7080,7 +7080,7 @@ parse_port_config(smartlist_t *out,
if (!strcasecmpstart(elt, "SessionGroup=")) {
int group = (int)tor_parse_long(elt+strlen("SessionGroup="),
10, 0, INT_MAX, , NULL);
- if (!ok || !allow_no_stream_options) {
+ if (!ok || allow_no_stream_options) {
log_warn(LD_CONFIG, "Invalid %sPort option '%s'",
portname, escaped(elt));
goto err;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix a logic error in deciding whether to accept SessionGroup=
commit 70b85358afd0a8d4291489f9e9f5654ab2d53371
Author: Nick Mathewson
Date: Fri May 31 08:26:10 2019 -0400
Fix a logic error in deciding whether to accept SessionGroup=
Fixes bug 22619; bugfix on 0.2.7.2-alpha
---
changes/bug22619| 3 +++
src/app/config/config.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changes/bug22619 b/changes/bug22619
new file mode 100644
index 0..9c71996f5
--- /dev/null
+++ b/changes/bug22619
@@ -0,0 +1,3 @@
+ o Minor bugfixes (circuit isolation):
+- Fix a logic error that prevented the SessionGroup sub-option from
+ being accepted. Fixes bug 22619; bugfix on 0.2.7.2-alpha.
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 2a504d306..352559759 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -7080,7 +7080,7 @@ parse_port_config(smartlist_t *out,
if (!strcasecmpstart(elt, "SessionGroup=")) {
int group = (int)tor_parse_long(elt+strlen("SessionGroup="),
10, 0, INT_MAX, , NULL);
- if (!ok || !allow_no_stream_options) {
+ if (!ok || allow_no_stream_options) {
log_warn(LD_CONFIG, "Invalid %sPort option '%s'",
portname, escaped(elt));
goto err;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add an environment variable to set GIT_PATH in git scripts
commit 0635170cf14c3b622ee9fdf67ea81f4e564dd39d
Author: Nick Mathewson
Date: Mon Jun 10 09:05:26 2019 -0400
Add an environment variable to set GIT_PATH in git scripts
---
scripts/git/git-merge-forward.sh | 2 +-
scripts/git/git-pull-all.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
index 98ad07c9c..15af6f3db 100755
--- a/scripts/git/git-merge-forward.sh
+++ b/scripts/git/git-merge-forward.sh
@@ -14,7 +14,7 @@
# ... which means that the tor worktrees are in /home//git/tor-wkt
# Where are all those git repositories?
-GIT_PATH="FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"
+GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"}
# The tor master git repository directory from which all the worktree have
# been created.
TOR_MASTER_NAME="tor"
diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh
index ec8511d27..6fe7e5981 100755
--- a/scripts/git/git-pull-all.sh
+++ b/scripts/git/git-pull-all.sh
@@ -14,7 +14,7 @@
# ... which means that the tor worktrees are in /home//git/tor-wkt
# Where are all those git repositories?
-GIT_PATH="FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"
+GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"}
# The tor master git repository directory from which all the worktree have
# been created.
TOR_MASTER_NAME="tor"
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Update git scripts for new versions
commit 46da530431d340cde22192d9df475d85b5d9fab7
Author: Nick Mathewson
Date: Mon Jun 10 08:54:22 2019 -0400
Update git scripts for new versions
{maint,release}-0.4.1 are now real
{maint,release}-0.3.4 are now EOL
Closes ticket 30822
---
scripts/git/git-merge-forward.sh | 18 +-
scripts/git/git-pull-all.sh | 14 +++---
scripts/git/git-push-all.sh | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
index 67af7e98b..98ad07c9c 100755
--- a/scripts/git/git-merge-forward.sh
+++ b/scripts/git/git-merge-forward.sh
@@ -38,15 +38,15 @@ TOR_WKT_NAME="tor-wkt"
#
# First set of arrays are the maint-* branch and then the release-* branch.
# New arrays need to be in the WORKTREE= array else they aren't considered.
-MAINT_034=( "maint-0.3.4" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.4" )
-MAINT_035=( "maint-0.3.5" "maint-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" )
+MAINT_035=( "maint-0.3.5" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" )
MAINT_040=( "maint-0.4.0" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" )
-MAINT_MASTER=( "master" "maint-0.4.0" "$GIT_PATH/$TOR_MASTER_NAME" )
+MAINT_041=( "maint-0.4.1" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" )
+MAINT_MASTER=( "master" "maint-0.4.1" "$GIT_PATH/$TOR_MASTER_NAME" )
RELEASE_029=( "release-0.2.9" "maint-0.2.9"
"$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" )
-RELEASE_034=( "release-0.3.4" "maint-0.3.4"
"$GIT_PATH/$TOR_WKT_NAME/release-0.3.4" )
RELEASE_035=( "release-0.3.5" "maint-0.3.5"
"$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" )
RELEASE_040=( "release-0.4.0" "maint-0.4.0"
"$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" )
+RELEASE_041=( "release-0.4.1" "maint-0.4.1"
"$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" )
# The master branch path has to be the main repository thus contains the
# origin that will be used to fetch the updates. All the worktrees are created
@@ -55,14 +55,14 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME"
# SC2034 -- shellcheck thinks that these are unused. We know better.
ACTUALLY_THESE_ARE_USED=
[tor-commits] [tor/master] Merge branch 'tor-github/pr/1098'
commit ece5133e0dbc9049e09d7104cc5cf21630902fa7 Merge: e9f1e975d 0635170cf Author: George Kadianakis Date: Tue Jun 11 13:19:43 2019 +0300 Merge branch 'tor-github/pr/1098' scripts/git/git-merge-forward.sh | 20 ++-- scripts/git/git-pull-all.sh | 16 scripts/git/git-push-all.sh | 6 +++--- 3 files changed, 21 insertions(+), 21 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH
commit bbddda3a185f507314f4f4d5e1a1060f3d9bc5e5
Author: Nick Mathewson
Date: Mon Jun 10 08:56:26 2019 -0400
push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH
We already allow this override in our pre-push hook, so let's allow
it here too.
(I call my upstream branches "origin")
---
scripts/git/git-push-all.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh
index 9e1b39c10..0701b27b5 100755
--- a/scripts/git/git-push-all.sh
+++ b/scripts/git/git-push-all.sh
@@ -1,9 +1,9 @@
#!/bin/bash
# The remote upstream branch on which git.torproject.org/tor.git points to.
-UPSTREAM_BRANCH="upstream"
+UPSTREAM_BRANCH=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"}
-git push $UPSTREAM_BRANCH \
+git push "$UPSTREAM_BRANCH" \
master \
{release,maint}-0.4.1 \
{release,maint}-0.4.0 \
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_outreach_md] Update translations for tor_outreach_md
commit 80fa5e874f2ded424f73b0eb8024d00df2d21ea9 Author: Translation commit bot Date: Tue Jun 11 10:20:32 2019 + Update translations for tor_outreach_md --- tor-outreach2019-2020-ca.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tor-outreach2019-2020-ca.md b/tor-outreach2019-2020-ca.md index 3715997b5..d3db8f6cc 100644 --- a/tor-outreach2019-2020-ca.md +++ b/tor-outreach2019-2020-ca.md @@ -1,8 +1,8 @@ # Tor Outreach Material 2019-2020 -# 1. TOR FOR PRIVACY +# 1. TOR PER A LA PRIVADESA -### Privacy is a human right +### La privadesa és un dret humà Like many of us, Aleisha spends most of her time online--connecting with friends, posting on social media, and browsing the web. @@ -16,9 +16,9 @@ She goes to a privacy training at a local hackerspace and learns about **Tor Bro --- -# 2.TOR FOR FEMINISTS +# 2. TOR PER AL FEMINISME -### The future is cyberfeminist +### El futur és ciberfeminista Fernanda runs a women's collective focused on reproductive rights in Brazil, where abortion is illegal. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
