date:20180410

[tor-commits] [translation/support-miscellaneous] Update translations for support-miscellaneous

2018-04-10 Thread translation

commit eea336cdeb78a031d61b1e241cbf437a06ebb7cb
Author: Translation commit bot 
Date:   Wed Apr 11 04:20:17 2018 +

Update translations for support-miscellaneous
---
 ga.json | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ga.json b/ga.json
index 41fe65a1f..9b6d39edd 100644
--- a/ga.json
+++ b/ga.json
@@ -32,20 +32,20 @@
 "miscellaneus-6": {
"id": "#miscellaneus-6",
"control": "miscellaneus-6",
-   "title": "Does Tor keep logs?",
-   "description": "Tor doesn't keep any logs that could 
identify a particular user. We do take some safe measurements of how the 
network functions, which you can check out at https://metrics.torproject.org/\;>âTor Metrics."
+   "title": "An gcoinnÃonn Tor logchomhaid?",
+   "description": "NÃ choinnÃonn Tor aon logchomhad a 
chabhrÃ³dh linn ÃºsÃ¡ideoirÃ a aithint. DÃ©anaimid tomhas slÃ¡n ar fheidhmiÃº 
an lÃonra, agus tÃ¡ na huimhreacha sin ar fÃ¡il ar  https://metrics.torproject.org/\;>âMeadaracht Tor."
 },
 "miscellaneus-7": {
"id": "#miscellaneus-7",
"control": "miscellaneus-7",
-   "title": "Does Tor Project offer email service or other privacy 
protecting web services?",
-   "description": "No, we don't provide any online 
services. A list of all of our software projects can be found on our https://www.torproject.org/projects/projects.html.en\;>âprojects 
page."
+   "title": "An gcuireann Tionscadal Tor seirbhÃsÃ rÃomhphoist ar 
fÃ¡il, nÃ³ aon seirbhÃs eile a chosnaÃonn prÃobhÃ¡ideachas?",
+   "description": "NÃ chuireann. Gheobhaidh tÃº liosta 
dÃ¡r dtionscadail ar fad ar https://www.torproject.org/projects/projects.html.en\;>âan leathanach 
seo."
 },
 "miscellaneus-8": {
"id": "#miscellaneus-8",
"control": "miscellaneus-8",
"title": "An bhfuil cead agam lÃ³gÃ³ Tor a ÃºsÃ¡id i dtÃ¡irge de mo 
chuid?",
-   "description": "You can read all about that on our 
https://www.torproject.org/docs/trademark-faq.html\;>âTrademark faq 
page."
+   "description": "TÃ¡ an t-eolas sin go lÃ©ir ar fÃ¡il 
ar https://www.torproject.org/docs/trademark-faq.html\;>âan 
leathanach seo a bhaineann le trÃ¡dmharcanna."
 },
 "miscellaneus-9": {
"id": "#miscellaneus-9",
@@ -56,31 +56,31 @@
 "miscellaneus-10": {
"id": "#miscellaneus-10",
"control": "miscellaneus-10",
-   "title": "Does the Tor Project offer hosting?",
-   "description": "No, the Tor Project does not offer 
hosting services."
+   "title": "An gcuireann Tionscadal Tor seirbhÃsÃ Ã³stÃ¡la ar fÃ¡il?",
+   "description": "NÃ chuireann."
 },
 "miscellaneus-11": {
"id": "#miscellaneus-11",
"control": "miscellaneus-11",
-   "title": "Can I change the number of hops Tor uses?",
+   "title": "An fÃ©idir liom lÃon na n-athsheachadÃ¡n a ÃºsÃ¡ideann Tor a 
athrÃº?",
"description": "Right now the path length is 
hard-coded at 3 plus the number of nodes in your path that are sensitive. That 
is, in normal cases it's 3, but for example if you're accessing an onion 
service or a \".exit\" address it could be more.https://www.freehaven.net/anonbib/#ccs07-doa\;>denial of 
security ttacks easier, and second because it could act as an 
identifier if only a small number of users have the same path length as 
you."
 },
 "miscellaneus-12": {
"id": "#miscellaneus-12",
"control": "miscellaneus-12",
-   "title": "How can I share files anonymously through Tor?",
+   "title": "Conas is fÃ©idir comhaid a roinnt trÃ Tor gan m'aitheantas a 
nochtadh?",
"description": "Many exit nodes are configured to 
block certain types of file sharing traffic, such as bittorrent. Bittorrent in 
specific is https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\;>ânot 
anonymous over Tor.For sharing files through 
Tor, âhttps://onionshare.org/\;>OnionShare is a 
good option."
 },
 "miscellaneus-13": {
"id": "#miscellaneus-13",
"control": "miscellaneus-13",
"title": "An fÃ©idir liom VPN a ÃºsÃ¡id le Tor?",
-   "description": "Generally speaking, we don't 
recommend using a VPN with Tor unless you're an advanced user who knows how to 
configure both in a way that doesn't compromise your privacy. You can find more 
detailed information about Tor + VPN at https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\;>âour 
wiki."
+   "description": "Is fÃ©idir, ach nÃ mholaimid VPN a 
ÃºsÃ¡id le Tor murar ÃºsÃ¡ideoir ardleibhÃ©il thÃº agus mura bhfuil saineolas 
agat ar conas is fÃ©idir Tor agus an VPN a chumrÃº sa chaoi nach gcuirfidh siad 
do phrÃobhÃ¡ideachas i gcontÃºirt. TÃ¡ tuilleadh eolais faoi Tor agus VPN le 
chÃ©ile ar fÃ¡il ar https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\;>an 
vicÃ."
 },
 "miscellaneus-14": {
"id": "#miscellaneus-14",

[tor-commits] [translation/support-miscellaneous] Update translations for support-miscellaneous

2018-04-10 Thread translation

commit 3f05f4a0459c4f7292f0a3eaa57e8a6e22b178cd
Author: Translation commit bot 
Date:   Wed Apr 11 03:50:19 2018 +

Update translations for support-miscellaneous
---
 ga.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ga.json b/ga.json
index 20d6ae31a..41fe65a1f 100644
--- a/ga.json
+++ b/ga.json
@@ -15,18 +15,18 @@
"id": "#miscellaneus-3",
"control": "miscellaneus-3",
"title": "CÃ© atÃ¡ ag maoiniÃº Tor?",
-   "description": "Tor is funded by a number of 
different sponsors including US federal agencies, private foundations, and 
individual donors. Check out a list of all https://www.torproject.org/about/sponsors.html.en\;>our 
sponsors and a series of https://blog.torproject.org/category/tags/form-990\;>blog 
posts on our financial reports.We feel that 
talking openly about our funders and funding model is the best way to maintain 
trust with our community. We are always seeking more diversity in our funding 
sources, especially from foundations and individuals."
+   "description": "TÃ¡ Tor Ã¡ mhaoiniÃº ag urraitheoirÃ 
Ã©agsÃºla, gnÃomhaireachtaÃ rialtais SAM, fondÃºireachtaÃ prÃobhÃ¡ideacha, 
agus daoine aonair. FÃ©ach  https://www.torproject.org/about/sponsors.html.en\;>liosta Ã¡r gcuid 
urraitheoirÃ chomh maith le sraith https://blog.torproject.org/category/tags/form-990\;>postÃ¡lacha 
blag maidir lenÃ¡r dtuarascÃ¡lacha airgeadais.Creidimid go bhfuil sÃ© tÃ¡bhachtach a bheith oscailte maidir 
lenÃ¡r gcuid maoinitheoirÃ agus Ã¡r samhail maoinithe chun iontaoibh an 
phobail a chothÃº. BÃmid ag lorg foinsÃ maoinithe nÃos ilchineÃ¡laÃ i 
gcÃ³naÃ, go hÃ¡irithe Ã³ fhondÃºireachtaÃ agus Ã³ dhaoine aonair."
  },
  "miscellaneus-4": {
"id": "#miscellaneus-4",
"control": "miscellaneus-4",
"title": "An fÃ©idir liom Tor a ÃºsÃ¡id in Ã©indÃ le bittorrent?",
-   "description": "We do not recommend using Tor with 
bittorrent. For further details, please see our https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\;>âblog 
post on the subject."
+   "description": "NÃ mholaimid duit Tor a ÃºsÃ¡id in 
Ã©indÃ le bittorrent. Chun tuilleadh eolais a fhÃ¡il, fÃ©ach ar https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\;>âan 
phostÃ¡il bhlag seo."
  },
  "miscellaneus-5": {
"id": "#miscellaneus-5",
"control": "miscellaneus-5",
-   "title": "The files on my computer have been locked, and someone is 
demanding I download Tor Browser to pay a ransom for my files!",
+   "title": "Chuir duine Ã©igin na comhaid ar mo rÃomhaire faoi ghlas, 
agus tÃ¡ sÃ© nÃ³ sÃ ag Ã©ileamh go n-ÃºsÃ¡idfinn BrabhsÃ¡laÃ Tor chun airgead 
fuascailte a Ãoc!",
"description": "We are so sorry, but you have been 
infected with malware. The Tor Project did not create this malware. The malware 
authors are asking you to download Tor Browser presumably to contact them 
anonymously with the ransom they're demanding from you. If this is your first 
introduction to Tor Browser, we understand that you might think we're bad 
people who enable even worse people. But please consider that our software is 
used every day for a wide variety of purposes by âhuman rights activists, 
journalists, domestic violence survivors, whistleblowers, law enforcement 
officers, and many others. Unfortunately, the protection that our software can 
provide to these groups of people can also be abused by criminals and malware 
authors. The Tor Project does not support or condone the use of our software 
for malicious purposes."
  },
 "miscellaneus-6": {

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-miscellaneous] Update translations for support-miscellaneous

2018-04-10 Thread translation

commit 8e4bea2d913cfcb76ec31a2a9c97d9f74b68d231
Author: Translation commit bot 
Date:   Wed Apr 11 01:20:20 2018 +

Update translations for support-miscellaneous
---
 ga.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ga.json b/ga.json
index 585b8edc7..20d6ae31a 100644
--- a/ga.json
+++ b/ga.json
@@ -9,7 +9,7 @@
"id": "#miscellaneus-2",
"control": "miscellaneus-2",
"title": "CÃ©n fÃ¡th nach gcuireann sibh cosc ar dhrochdhaoine a 
dhÃ©anann drochrudaÃ ar lÃonra Tor?",
-   "description": "Tor is designed to defend human 
rights and privacy by preventing anyone from censoring things, even us. We hate 
that there are some people who use Tor to do terrible things, but we can't do 
anything to get rid of them without also undermining the human rights 
activists, journalists, abuse survivors, and other people who use Tor for good 
things. If we wanted to block certain people from using Tor, we'd basically be 
adding a backdoor to the software, which would open up our vulnerable users to 
attacks from bad regimes and other adversaries."
+   "description": "Dearadh Tor le cearta daonna agus 
prÃobhÃ¡ideachas a chosaint trÃ chosc a chur ar dhaoine a dhÃ©anann 
cinsireacht, muidne san Ã¡ireamh. Is fuath linn go ndÃ©anann daoine rudaÃ 
uafÃ¡sacha ar lÃonra Tor, ach nÃ fÃ©idir linn bata is bÃ³thar a thabhairt 
dÃ³ibh gan go leor gnÃomhaÃoch, iriseoirÃ, agus daoine a thÃ¡inig slÃ¡n Ã³ 
dhroch-Ãde a chur i gcontÃºirt. DÃ¡ gcuirfimis cosc ar dhaoine Ã¡irithe, an 
bealach amhÃ¡in a bheadh againn Ã© sin a dhÃ©anamh nÃ¡ saghas \"cÃºldorais\" a 
chur ar fÃ¡il, rud a chuirfeadh Ã¡r gcuid ÃºsÃ¡ideoirÃ i gcontÃºirt Ã³ 
dhrochrialtais agus Ã³ naimhde eile."
 },
  "miscellaneus-3": {
"id": "#miscellaneus-3",

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-miscellaneous] Update translations for support-miscellaneous

2018-04-10 Thread translation

commit dbf4ebb8b3669cbfb8cc23290af68c4574ca8852
Author: Translation commit bot 
Date:   Wed Apr 11 00:20:18 2018 +

Update translations for support-miscellaneous
---
 ga.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ga.json b/ga.json
index 5e4cbd099..585b8edc7 100644
--- a/ga.json
+++ b/ga.json
@@ -3,7 +3,7 @@
"id": "#miscellaneus-1",
"control": "miscellaneus-1",
"title": "Caithfidh mÃ© ÃºsÃ¡ideoir Tor a lorg mar gheall ar chÃºis 
an-lÃ¡idir. An gcabhrÃ³dh sibh liom?",
-   "description": "There is nothing the Tor developers 
can do to trace Tor users. The same protections that keep bad people from 
breaking Tor's anonymity also prevent us from tracking users."
+   "description": "NÃl forbrÃ³irÃ Tor in ann aon rud a 
dhÃ©anamh chun ÃºsÃ¡ideoirÃ Tor a lorg, mar gheall ar an gnÃ©ithe cÃ©anna a 
chosnaÃonn do chuid faisnÃ©is phearsanta ar dhrochdhaoine."
 },
 "miscellaneus-2": {
"id": "#miscellaneus-2",

___
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 'isis-github/bug25425_squashed2'

2018-04-10 Thread nickm

commit 6bdfaa8b244ca3e10e57f6d99616af1d5f68fa67
Merge: 6e467a7a3 4178642bf
Author: Nick Mathewson 
Date:   Tue Apr 10 15:32:26 2018 -0400

Merge remote-tracking branch 'isis-github/bug25425_squashed2'

 changes/bug25425|   4 +
 src/or/bridges.c|  10 +-
 src/or/bridges.h|  13 +-
 src/or/transports.c |   6 +-
 src/or/transports.h |   5 +-
 src/test/include.am |   1 +
 src/test/test.c |   1 +
 src/test/test.h |   9 +
 src/test/test_bridges.c | 618 
 9 files changed, 658 insertions(+), 9 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] changes: Add changes file for 25425.

2018-04-10 Thread nickm

commit 4178642bf83736d154176623ba8dce845a5b412c
Author: Isis Lovecruft 
Date:   Tue Apr 10 19:26:46 2018 +

changes: Add changes file for 25425.
---
 changes/bug25425 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/bug25425 b/changes/bug25425
new file mode 100644
index 0..41f1a47b1
--- /dev/null
+++ b/changes/bug25425
@@ -0,0 +1,4 @@
+  o Minor features (testing):
+- A new unittests module specifically for testing the functions in the
+  (new-ish) bridges.c module has been created with new unittests, raising
+  the code coverage percentages.  Closes 25425.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] test: Add testing module and some unittests for bridges.c.

2018-04-10 Thread nickm

commit c2c5b13e5d8a7736028940175f182fda1ec9
Author: Isis Lovecruft 
Date:   Mon Mar 5 20:43:26 2018 +

test: Add testing module and some unittests for bridges.c.

This roughly doubles our test coverage of the bridges.c module.

 * ADD new testing module, .../src/test/test_bridges.c.
 * CHANGE a few function declarations from `static` to `STATIC`.
 * CHANGE one function in transports.c, transport_get_by_name(), to be
   mockable.
 * CLOSES #25425: https://bugs.torproject.org/25425
---
 src/or/bridges.c|  10 +-
 src/or/bridges.h|  13 +-
 src/or/transports.c |   6 +-
 src/or/transports.h |   5 +-
 src/test/include.am |   1 +
 src/test/test.c |   1 +
 src/test/test.h |   1 +
 src/test/test_bridges.c | 618 
 8 files changed, 646 insertions(+), 9 deletions(-)

diff --git a/src/or/bridges.c b/src/or/bridges.c
index d88d6c643..4ee355004 100644
--- a/src/or/bridges.c
+++ b/src/or/bridges.c
@@ -11,6 +11,8 @@
  * Bridges are fixed entry nodes, used for censorship circumvention.
  **/
 
+#define TOR_BRIDGES_PRIVATE
+
 #include "or.h"
 #include "bridges.h"
 #include "circuitbuild.h"
@@ -93,7 +95,7 @@ sweep_bridge_list(void)
 }
 
 /** Initialize the bridge list to empty, creating it if needed. */
-static void
+STATIC void
 clear_bridge_list(void)
 {
   if (!bridge_list)
@@ -156,7 +158,7 @@ bridge_get_addr_port(const bridge_info_t *bridge)
  * bridge with no known digest whose address matches any of the
  * tor_addr_port_t's in orports, return that bridge.  Else return
  * NULL. */
-static bridge_info_t *
+STATIC bridge_info_t *
 get_configured_bridge_by_orports_digest(const char *digest,
 const smartlist_t *orports)
 {
@@ -350,7 +352,7 @@ bridge_has_digest(const bridge_info_t *bridge, const char 
*digest)
  * existing bridge with the same address and port, and warn the user as
  * appropriate.
  */
-static void
+STATIC void
 bridge_resolve_conflicts(const tor_addr_t *addr, uint16_t port,
  const char *digest, const char *transport_name)
 {
@@ -472,7 +474,7 @@ bridge_add_from_config(bridge_line_t *bridge_line)
 }
 
 /** If digest is one of our known bridges, return it. */
-bridge_info_t *
+STATIC bridge_info_t *
 find_bridge_by_digest(const char *digest)
 {
   if (! bridge_list)
diff --git a/src/or/bridges.h b/src/or/bridges.h
index 54a625025..3108eb555 100644
--- a/src/or/bridges.h
+++ b/src/or/bridges.h
@@ -20,7 +20,6 @@ typedef struct bridge_info_t bridge_info_t;
 void mark_bridge_list(void);
 void sweep_bridge_list(void);
 const smartlist_t *bridge_list_get(void);
-bridge_info_t *find_bridge_by_digest(const char *digest);
 const uint8_t *bridge_get_rsa_id_digest(const bridge_info_t *bridge);
 const tor_addr_port_t * bridge_get_addr_port(const bridge_info_t *bridge);
 bridge_info_t *get_configured_bridge_by_addr_port_digest(
@@ -65,5 +64,17 @@ MOCK_DECL(download_status_t *, get_bridge_dl_status_by_id,
 
 void bridges_free_all(void);
 
+#ifdef TOR_BRIDGES_PRIVATE
+STATIC void clear_bridge_list(void);
+STATIC bridge_info_t *find_bridge_by_digest(const char *digest);
+STATIC bridge_info_t *get_configured_bridge_by_orports_digest(
+  const char *digest,
+  const smartlist_t *orports);
+STATIC void bridge_resolve_conflicts(const tor_addr_t *addr,
+ uint16_t port,
+ const char *digest,
+ const char *transport_name);
+#endif /* defined(TOR_BRIDGES_PRIVATE) */
+
 #endif /* !defined(TOR_BRIDGES_H) */
 
diff --git a/src/or/transports.c b/src/or/transports.c
index b08dcd161..fb6c29de7 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -135,7 +135,7 @@ static smartlist_t *transport_list = NULL;
 /** Returns a transport_t struct for a transport proxy supporting the
 protocol name listening at addr:port using
 SOCKS version socks_ver. */
-static transport_t *
+STATIC transport_t *
 transport_new(const tor_addr_t *addr, uint16_t port,
   const char *name, int socks_ver,
   const char *extra_info_args)
@@ -222,8 +222,8 @@ transport_copy(const transport_t *transport)
 
 /** Returns the transport in our transport list that has the name name.
  *  Else returns NULL. */
-transport_t *
-transport_get_by_name(const char *name)
+MOCK_IMPL(transport_t *,
+transport_get_by_name,(const char *name))
 {
   tor_assert(name);
 
diff --git a/src/or/transports.h b/src/or/transports.h
index 1b2786472..022b926a0 100644
--- a/src/or/transports.h
+++ b/src/or/transports.h
@@ -38,7 +38,7 @@ MOCK_DECL(int, transport_add_from_config,
 void transport_free_(transport_t *transport);
 #define transport_free(tr) FREE_AND_NULL(transport_t, transport_free_, (tr))
 
-transport_t

[tor-commits] [tor/master] tests: Make tt_finished() macro for tests without tt_*_op() calls.

2018-04-10 Thread nickm

commit 3ee7a8d3a545633c578e059687f7683c43108a10
Author: Isis Lovecruft 
Date:   Thu Mar 29 23:27:42 2018 +

tests: Make tt_finished() macro for tests without tt_*_op() calls.
---
 src/test/test.h | 8 
 src/test/test_bridges.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/test/test.h b/src/test/test.h
index 91c8d3ebd..1eb3b6a2e 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -72,6 +72,14 @@
 I64_PRINTF_TYPE, I64_FORMAT,   \
 {print_ = (I64_PRINTF_TYPE) value_;}, {}, TT_EXIT_TEST_FUNCTION)
 
+/**
+ * Declare that the test is done, even though no tt___op() calls were made.
+ *
+ * For use when you only want to test calling something, but not check
+ * any values/pointers/etc afterwards.
+ */
+#define tt_finished() TT_EXIT_TEST_FUNCTION
+
 const char *get_fname(const char *name);
 const char *get_fname_rnd(const char *name);
 struct crypto_pk_t *pk_generate(int idx);
diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c
index aada363d9..b5bd27e09 100644
--- a/src/test/test_bridges.c
+++ b/src/test/test_bridges.c
@@ -107,7 +107,7 @@ static void
 test_bridges_helper_func_add_bridges_to_bridgelist(void *arg)
 {
   helper_add_bridges_to_bridgelist(arg);
-  tt_int_op(0, OP_EQ, 0);
+  tt_finished();
 
  done:
   mark_bridge_list();



___
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 'isis-github/bug25409'

2018-04-10 Thread nickm

commit 6e467a7a340cdc0267206ebaf8dca54c1a4a7b0a
Merge: ef16a11b9 550037f67
Author: Nick Mathewson 
Date:   Tue Apr 10 15:27:09 2018 -0400

Merge remote-tracking branch 'isis-github/bug25409'

 changes/bug25409   |  12 ++
 changes/ticket25409|   6 +
 doc/tor.1.txt  |  19 +--
 src/common/util.c  | 348 -
 src/common/util.h  |   9 +-
 src/or/config.c|  13 +-
 src/or/main.c  |  29 
 src/or/or.h|   4 -
 src/test/test_options.c|  32 
 src/tools/tor-fw-helper/README |  10 --
 10 files changed, 24 insertions(+), 458 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Remove PortForwarding options

2018-04-10 Thread nickm

commit 9df110cd722a383414584d5ff6494944c993bb6d
Author: Neel Chauhan 
Date:   Tue Mar 20 08:27:41 2018 -0400

Remove PortForwarding options

Signed-off-by: Isis Lovecruft 
---
 changes/ticket25409|   6 +
 doc/tor.1.txt  |  19 +--
 src/common/util.c  | 348 -
 src/common/util.h  |   9 +-
 src/or/config.c|  11 --
 src/or/main.c  |  29 
 src/or/or.h|   4 -
 src/test/test_options.c|  32 
 src/tools/tor-fw-helper/README |  10 --
 9 files changed, 10 insertions(+), 458 deletions(-)

diff --git a/changes/ticket25409 b/changes/ticket25409
new file mode 100644
index 0..f0006fbc5
--- /dev/null
+++ b/changes/ticket25409
@@ -0,0 +1,6 @@
+  o Code simplification and refactoring:
+  We remove the PortForwsrding and PortForwardingHelper options, related
+  functions, and the port_forwarding tests. These options were used by
+  the now-deprecated Vidalia to help ordinary users become Tor relays or
+  bridges. Closes ticket 25409. Patch by Neel Chauhan.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index ccf6f8777..3d0e51f55 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -805,10 +805,9 @@ GENERAL OPTIONS
 
 [[NoExec]] **NoExec** **0**|**1**::
 If this option is set to 1, then Tor will never launch another
-executable, regardless of the settings of PortForwardingHelper,
-ClientTransportPlugin, or ServerTransportPlugin.  Once this
-option has been set to 1, it cannot be set back to 0 without
-restarting Tor. (Default: 0)
+executable, regardless of the settings of ClientTransportPlugin
+or ServerTransportPlugin.  Once this option has been set to 1,
+it cannot be set back to 0 without restarting Tor. (Default: 0)
 
 [[Schedulers]] **Schedulers** **KIST**|**KISTLite**|**Vanilla**::
 Specify the scheduler type that tor should use. The scheduler is
@@ -2083,18 +2082,6 @@ is non-zero):
 For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and
 IPv4Only and IPv6Only are mutually exclusive.
 
-[[PortForwarding]] **PortForwarding** **0**|**1**::
-Attempt to automatically forward the DirPort and ORPort on a NAT router
-connecting this Tor server to the Internet. If set, Tor will try both
-NAT-PMP (common on Apple routers) and UPnP (common on routers from other
-manufacturers). (Default: 0)
-
-[[PortForwardingHelper]] **PortForwardingHelper** __filename__|__pathname__::
-If PortForwarding is set, use this executable to configure the forwarding.
-If set to a filename, the system path will be searched for the executable.
-If set to a path, only the specified path will be executed.
-(Default: tor-fw-helper)
-
 [[PublishServerDescriptor]] **PublishServerDescriptor** 
**0**|**1**|**v3**|**bridge**,**...**::
 This option specifies which descriptors Tor will publish when acting as
 a relay. You can
diff --git a/src/common/util.c b/src/common/util.c
index f63b12167..065b3245f 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -5111,30 +5111,6 @@ stream_status_to_string(enum stream_status stream_status)
   }
 }
 
-/* DOCDOC */
-static void
-log_portfw_spawn_error_message(const char *buf,
-   const char *executable, int *child_status)
-{
-  /* Parse error message */
-  int retval, child_state, saved_errno;
-  retval = tor_sscanf(buf, SPAWN_ERROR_MESSAGE "%x/%x",
-  _state, _errno);
-  if (retval == 2) {
-log_warn(LD_GENERAL,
- "Failed to start child process \"%s\" in state %d: %s",
- executable, child_state, strerror(saved_errno));
-if (child_status)
-  *child_status = 1;
-  } else {
-/* Failed to parse message from child process, log it as a
-   warning */
-log_warn(LD_GENERAL,
- "Unexpected message from port forwarding helper \"%s\": %s",
- executable, buf);
-  }
-}
-
 #ifdef _WIN32
 
 /** Return a smartlist containing lines outputted from
@@ -5254,42 +5230,6 @@ tor_get_lines_from_handle, (int fd, enum stream_status 
*stream_status_out))
   return lines;
 }
 
-/** Read from fd, and send lines to log at the specified log level.
- * Returns 1 if stream is closed normally, -1 if there is a error reading, and
- * 0 otherwise. Handles lines from tor-fw-helper and
- * tor_spawn_background() specially.
- */
-static int
-log_from_pipe(int fd, int severity, const char *executable,
-  int *child_status)
-{
-  char buf[256];
-  enum stream_status r;
-
-  for (;;) {
-r = get_string_from_pipe(fd, buf, sizeof(buf) - 1);
-
-if (r == IO_STREAM_CLOSED) {
-  return 1;
-} else if (r == IO_STREAM_EAGAIN) {
-  return 0;
-} else if (r == IO_STREAM_TERM) {
-  return -1;
-}
-
-tor_assert(r == IO_STREAM_OKAY);
-
-/* Check if buf starts with SPAWN_ERROR_MESSAGE */

[tor-commits] [tor/master] config: Obsolete PortForwarding and PortForwardingHelper options.

2018-04-10 Thread nickm

commit 65d6b66e99a1a441805402ba8f275a63bccbf0f5
Author: Isis Lovecruft 
Date:   Tue Apr 10 19:08:57 2018 +

config: Obsolete PortForwarding and PortForwardingHelper options.

 * FIXES part of #25409: https://bugs.torproject.org/25409
---
 src/or/config.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/or/config.c b/src/or/config.c
index a0890e278..b2cb1f407 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -492,6 +492,8 @@ static config_var_t option_vars_[] = {
   V(TestingSigningKeySlop,   INTERVAL, "1 day"),
 
   V(OptimisticData,  AUTOBOOL, "auto"),
+  OBSOLETE("PortForwarding"),
+  OBSOLETE("PortForwardingHelper"),
   OBSOLETE("PreferTunneledDirConns"),
   V(ProtocolWarnings,BOOL, "0"),
   V(PublishServerDescriptor, CSV,  "1"),



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] changes: Add changes file for 25409.

2018-04-10 Thread nickm

commit 550037f67779fc52d08a12c5f4ffdd04d55841a9
Author: Isis Lovecruft 
Date:   Tue Apr 10 19:21:10 2018 +

changes: Add changes file for 25409.
---
 changes/bug25409 | 12 
 1 file changed, 12 insertions(+)

diff --git a/changes/bug25409 b/changes/bug25409
new file mode 100644
index 0..093d8f58b
--- /dev/null
+++ b/changes/bug25409
@@ -0,0 +1,12 @@
+  o Removed features:
+- The PortForwarding and PortForwardingHelper features have been
+  removed. The reasoning is, given that implementations of NAT traversal
+  protocols within common consumer grade routers are frequently buggy, and
+  that the target audience for a NAT punching feature is a perhaps
+  less-technically-inclined relay operator, when the helper fails to setup
+  traversal the problems are usually deep, ugly, and very router specific,
+  making them horrendously impossible for technical support to reliable
+  assist with, and thus resulting in frustration all around.  
Unfortunately,
+  relay operators who would like to run relays behind NATs will need to
+  become more familiar with the port forwarding configurations on their
+  local router.  Closes 25409.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-tbb] Update translations for support-tbb

2018-04-10 Thread translation

commit 199a98e572a7babaae90f9db4c4626bae436b8eb
Author: Translation commit bot 
Date:   Tue Apr 10 19:20:26 2018 +

Update translations for support-tbb
---
 ga.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ga.json b/ga.json
index f76ecde4a..2f80ba01a 100644
--- a/ga.json
+++ b/ga.json
@@ -3,7 +3,7 @@
"id": "#tbb-1",
"control": "tbb-1",
"title": "Cad iad na fadhbanna is coitianta a bhaineann leis an leagan 
cobhsaÃ is dÃ©anaÃ de BhrabhsÃ¡laÃ Tor?",
-   "description": "Nuair a fhoilsÃmid leagan cobhsaÃ 
nua de BhrabhsÃ¡laÃ Tor, scrÃobhaimid postÃ¡il bhlag a dhÃ©anann cur sÃos ar 
na gnÃ©ithe nua agus aon fhadhbanna ar Ã¡r n-eolas. MÃ¡ tÃ¡ fadhbanna agat a 
thosaigh tar Ã©is duit BrabhsÃ¡laÃ Tor a nuashonrÃº, fÃ©ach ar an bpostÃ¡il is 
dÃ©anaÃ faoin leagan cobhsaÃ ar âhttps://blog.torproject.org\;>https://blog.torproject.org le 
fÃ©achaint an bhfuil d'fhadhb luaite."
+   "description": "Nuair a fhoilsÃmid leagan cobhsaÃ 
nua de BhrabhsÃ¡laÃ Tor, scrÃobhaimid postÃ¡il bhlag a dhÃ©anann cur sÃos ar 
na gnÃ©ithe nua agus ar aon fhadhbanna ar Ã¡r n-eolas. MÃ¡ tÃ¡ fadhbanna agat a 
thosaigh tar Ã©is duit BrabhsÃ¡laÃ Tor a nuashonrÃº, fÃ©ach ar an bpostÃ¡il is 
dÃ©anaÃ faoin leagan cobhsaÃ ar âhttps://blog.torproject.org\;>https://blog.torproject.org le 
fÃ©achaint an bhfuil d'fhadhb luaite ann."
 },
 "tbb-2": {
"id": "#tbb-2",
@@ -68,7 +68,7 @@
 "tbb-11": {
"id": "#tbb-11",
"control": "tbb-11",
-   "title": "D'ÃoslÃ³dÃ¡il agus shuiteÃ¡il mÃ© BrabhsÃ¡laÃ Tor ar 
Windows, ach nÃ fheicim ar mo rÃomhaire Ã© anois.",
+   "title": "D'ÃoslÃ³dÃ¡il agus shuiteÃ¡il mÃ© BrabhsÃ¡laÃ Tor ar 
Windows, ach anois nÃ fheicim ar mo rÃomhaire Ã©.",
"description": "The file you download and run prompts 
you for a destination. If you don't remember what this destination was, it's 
most likely your Downloads or Desktop folder. The default setting in the 
Windows installer also creates a shortcut for you on your Desktop, though be 
aware that you may have accidentally unticked the option to create a shortcut. 
If you can't find it in either of those folders, download it again and look for 
the prompt that asks you to choose a directory to download it in. Choose a 
directory location that you'll remember easily, and once the download finishes 
you should see a Tor Browser folder there."
 },
 "tbb-12": {
@@ -92,7 +92,7 @@
 "tbb-15": {
"id": "#tbb-15",
"control": "tbb-15",
-   "title": "An fÃ©idir liom BrabhsÃ¡laÃ Tor a ÃoslÃ³dÃ¡il ar ChromeOS?",
+   "title": "An fÃ©idir liom BrabhsÃ¡laÃ Tor a ÃºsÃ¡id ar ChromeOS?",
"description": "NÃ fÃ©idir, faraor. NÃl aon leagan 
de BhrabhsÃ¡laÃ Tor ar ChromeOS faoi lÃ¡thair."
 },
 "tbb-16": {

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] Don't retry downloading descriptors when we've timed out

2018-04-10 Thread atagar

commit e43a168fd8d8d3f561c3feb4f36af357ec32f848
Author: Damian Johnson 
Date:   Tue Apr 10 10:20:46 2018 -0700

Don't retry downloading descriptors when we've timed out

Presently one of our dirauths (tor26) is having some health issues. In
particular connection resets and timeouts.

This has revealed a couple issues. First is that python doesn't always honor
its socket timeouts. Though rare, our requests to tor26 sometimes hang for
hours despite imposing a one minute timeout. Second, we retry requests even
when our timeout has been reached (making callers effectively wait three 
times
as long as they asked).

The first of these issues is still baffling me. Unfortunately I've seen it, 
but
can't reliably repro. The second issue however is pretty straight forward so
fixing it.
---
 docs/change_log.rst|  1 +
 stem/descriptor/remote.py  | 13 -
 test/unit/descriptor/remote.py | 14 +++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index b0773382..9be7912d 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -57,6 +57,7 @@ The following are only available within Stem's `git repository
   * `Fallback directory v2 support 
`_, 
which adds *nickname* and *extrainfo*
   * Added zstd and lzma compression support (:spec:`1cb56af`)
   * Added server descriptor's new is_hidden_service_dir attribute
+  * Don't retry downloading descriptors when we've timed out
   * Reduced maximum descriptors fetched by the remote module to match tor's 
new limit (:trac:`24743`)
   * Consensus **shared_randomness_*_reveal_count** attributes undocumented, 
and unavailable if retrieved before their corresponding 
shared_randomness_*_value attribute (:trac:`25046`)
   * Allow 'proto' line to have blank values (:spec:`a8455f4`)
diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index 97fd1e5c..cf1b1628 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -430,7 +430,7 @@ class Query(object):
 self._downloader_thread = threading.Thread(
   name = 'Descriptor Query',
   target = self._download_descriptors,
-  args = (self.retries,)
+  args = (self.retries, self.timeout)
 )
 
 self._downloader_thread.setDaemon(True)
@@ -520,7 +520,7 @@ class Query(object):
 
 return 'http://%s:%i/%s' % (address, dirport, self.resource.lstrip('/'))
 
-  def _download_descriptors(self, retries):
+  def _download_descriptors(self, retries, timeout):
 try:
   use_authority = retries == 0 and self.fall_back_to_authority
   self.download_url = self._pick_url(use_authority)
@@ -531,7 +531,7 @@ class Query(object):
   self.download_url,
   headers = {'Accept-Encoding': ', '.join(self.compression)},
 ),
-timeout = self.timeout,
+timeout = timeout,
   )
 
   data = response.read()
@@ -562,9 +562,12 @@ class Query(object):
 except:
   exc = sys.exc_info()[1]
 
-  if retries > 0:
+  if timeout is not None:
+timeout -= time.time() - self.start_time
+
+  if retries > 0 and (timeout is None or timeout > 0):
 log.debug("Unable to download descriptors from '%s' (%i retries 
remaining): %s" % (self.download_url, retries, exc))
-return self._download_descriptors(retries - 1)
+return self._download_descriptors(retries - 1, timeout)
   else:
 log.debug("Unable to download descriptors from '%s': %s" % 
(self.download_url, exc))
 self.error = exc
diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py
index 05cf1d57..cc4c3997 100644
--- a/test/unit/descriptor/remote.py
+++ b/test/unit/descriptor/remote.py
@@ -4,6 +4,7 @@ Unit tests for stem.descriptor.remote.
 
 import socket
 import tempfile
+import time
 import unittest
 
 import stem.descriptor.remote
@@ -273,19 +274,26 @@ class TestDescriptorDownloader(unittest.TestCase):
 
   @patch(URL_OPEN)
   def test_query_with_timeout(self, urlopen_mock):
-urlopen_mock.side_effect = socket.timeout('connection timed out')
+def urlopen_call(*args, **kwargs):
+  time.sleep(0.06)
+  raise socket.timeout('connection timed out')
+
+urlopen_mock.side_effect = urlopen_call
 
 query = stem.descriptor.remote.Query(
   TEST_RESOURCE,
   'server-descriptor 1.0',
   endpoints = [('128.31.0.39', 9131)],
   fall_back_to_authority = False,
-  timeout = 5,
+  timeout = 0.1,
   validate = True,
 )
 
+# After two requests we'll have reached our total permissable timeout.
+# Check that we don't make a third.
+
 self.assertRaises(socket.timeout, query.run)
-self.assertEqual(3, urlopen_mock.call_count)
+self.assertEqual(2, urlopen_mock.call_count)
 
   @patch(URL_OPEN,

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

2018-04-10 Thread nickm

commit 10a1969ca327c517e20aeefdc86f88c95322289d
Merge: b68e636b3 1295044dc
Author: Nick Mathewson 
Date:   Tue Apr 10 14:25:57 2018 -0400

Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-04-10 Thread nickm

commit 3230814d2ba0b213e1eba645a7a610fd28e31a11
Merge: f46777163 0b1a054d6
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-04-10 Thread nickm

commit d3ac47b4153fbe51ca63882ce63165abdf50901b
Merge: 124e06e85 db6902c23
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index abf62c2e8,7548ed094..4938ae8e7
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -156,7 -144,9 +156,8 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
src/or/bridges.h\
 -  src/or/buffers.h\
src/or/channel.h\
src/or/channelpadding.h \
src/or/channeltls.h \



___
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.2] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

2018-04-10 Thread nickm

commit 10a1969ca327c517e20aeefdc86f88c95322289d
Merge: b68e636b3 1295044dc
Author: Nick Mathewson 
Date:   Tue Apr 10 14:25:57 2018 -0400

Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-04-10 Thread nickm

commit a6f21a61d1a1893087c744935626a8dc75010385
Merge: bc250fcab d3ac47b41
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.3] Lift the list of default directory servers into their own file.

2018-04-10 Thread nickm

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Apr 6 03:58:16 2018 +0200

Lift the list of default directory servers into their own file.

This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.

Patch by beastr0.

See: https://bugs.torproject.org/24854
---
 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/changes/bug24854 b/changes/bug24854
new file mode 100644
index 0..64e10772e
--- /dev/null
+++ b/changes/bug24854
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Move the list of default directory authorities to their own file for
+  inclusion using the C preprocessor. Closes ticket 24854. Patch by 
"beastr0".
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
new file mode 100644
index 0..58e6817c8
--- /dev/null
+++ b/src/or/auth_dirs.inc
@@ -0,0 +1,33 @@
+"moria1 orport=9101 "
+  "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
+  "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
+"tor26 orport=443 "
+  "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
+  "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
+  "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
+"dizum orport=443 "
+  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
+  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+"Bifroest orport=443 bridge "
+  "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
+"gabelmoo orport=443 "
+  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
+  "ipv6=[2001:638:a000:4140:::189]:443 "
+  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
+"dannenberg orport=443 "
+  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
+"maatuska orport=80 "
+  "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
+  "ipv6=[2001:67c:289c::9]:80 "
+  "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
+"Faravahar orport=443 "
+  "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
+  "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
+"longclaw orport=443 "
+  "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
+  "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
+"bastet orport=443 "
+  "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+  "ipv6=[2620:13:4000:6000::1000:118]:443 "
+  "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
diff --git a/src/or/config.c b/src/or/config.c
index 3b4027433..75e406585 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -967,39 +967,7 @@ escaped_safe_str(const char *address)
 /** List of default directory authorities */
 
 static const char *default_authorities[] = {
-  "moria1 orport=9101 "
-"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
-"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
-  "tor26 orport=443 "
-"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
-"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
-"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
-  "dizum orport=443 "
-"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Bifroest orport=443 bridge "
-"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
-  "gabelmoo orport=443 "
-"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
-"ipv6=[2001:638:a000:4140:::189]:443 "
-"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
-  "dannenberg orport=443 "
-"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
-"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-  "maatuska orport=80 "
-"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
-"ipv6=[2001:67c:289c::9]:80 "
-"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
-  "Faravahar orport=443 "
-"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
-"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
-  "longclaw orport=443 "
-"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
-"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
-  "bastet orport=443 "
-"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
-"ipv6=[2620:13:4000:6000::1000:118]:443 "
-"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
+#include "auth_dirs.inc"
   NULL
 };
 
diff --git a/src/or/include.am b/src/or/include.am
index 5108a08e5..19cf00264 100644
--- a/src/or/include.am
+++

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2018-04-10 Thread nickm

commit 8eb9aaf4f65affed0aa450028464a30ab06f74dd
Merge: 347b38d6d db6902c23
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.3] Lift the list of default directory servers into their own file.

2018-04-10 Thread nickm

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Apr 6 03:58:16 2018 +0200

Lift the list of default directory servers into their own file.

This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.

Patch by beastr0.

See: https://bugs.torproject.org/24854
---
 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/changes/bug24854 b/changes/bug24854
new file mode 100644
index 0..64e10772e
--- /dev/null
+++ b/changes/bug24854
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Move the list of default directory authorities to their own file for
+  inclusion using the C preprocessor. Closes ticket 24854. Patch by 
"beastr0".
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
new file mode 100644
index 0..58e6817c8
--- /dev/null
+++ b/src/or/auth_dirs.inc
@@ -0,0 +1,33 @@
+"moria1 orport=9101 "
+  "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
+  "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
+"tor26 orport=443 "
+  "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
+  "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
+  "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
+"dizum orport=443 "
+  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
+  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+"Bifroest orport=443 bridge "
+  "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
+"gabelmoo orport=443 "
+  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
+  "ipv6=[2001:638:a000:4140:::189]:443 "
+  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
+"dannenberg orport=443 "
+  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
+"maatuska orport=80 "
+  "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
+  "ipv6=[2001:67c:289c::9]:80 "
+  "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
+"Faravahar orport=443 "
+  "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
+  "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
+"longclaw orport=443 "
+  "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
+  "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
+"bastet orport=443 "
+  "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+  "ipv6=[2620:13:4000:6000::1000:118]:443 "
+  "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
diff --git a/src/or/config.c b/src/or/config.c
index 3b4027433..75e406585 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -967,39 +967,7 @@ escaped_safe_str(const char *address)
 /** List of default directory authorities */
 
 static const char *default_authorities[] = {
-  "moria1 orport=9101 "
-"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
-"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
-  "tor26 orport=443 "
-"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
-"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
-"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
-  "dizum orport=443 "
-"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Bifroest orport=443 bridge "
-"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
-  "gabelmoo orport=443 "
-"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
-"ipv6=[2001:638:a000:4140:::189]:443 "
-"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
-  "dannenberg orport=443 "
-"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
-"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-  "maatuska orport=80 "
-"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
-"ipv6=[2001:67c:289c::9]:80 "
-"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
-  "Faravahar orport=443 "
-"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
-"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
-  "longclaw orport=443 "
-"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
-"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
-  "bastet orport=443 "
-"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
-"ipv6=[2620:13:4000:6000::1000:118]:443 "
-"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
+#include "auth_dirs.inc"
   NULL
 };
 
diff --git a/src/or/include.am b/src/or/include.am
index 5108a08e5..19cf00264 100644
--- a/src/or/include.am
+++

[tor-commits] [tor/release-0.3.2] Lift the list of default directory servers into their own file.

2018-04-10 Thread nickm

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Apr 6 03:58:16 2018 +0200

Lift the list of default directory servers into their own file.

This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.

Patch by beastr0.

See: https://bugs.torproject.org/24854
---
 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/changes/bug24854 b/changes/bug24854
new file mode 100644
index 0..64e10772e
--- /dev/null
+++ b/changes/bug24854
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Move the list of default directory authorities to their own file for
+  inclusion using the C preprocessor. Closes ticket 24854. Patch by 
"beastr0".
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
new file mode 100644
index 0..58e6817c8
--- /dev/null
+++ b/src/or/auth_dirs.inc
@@ -0,0 +1,33 @@
+"moria1 orport=9101 "
+  "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
+  "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
+"tor26 orport=443 "
+  "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
+  "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
+  "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
+"dizum orport=443 "
+  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
+  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+"Bifroest orport=443 bridge "
+  "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
+"gabelmoo orport=443 "
+  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
+  "ipv6=[2001:638:a000:4140:::189]:443 "
+  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
+"dannenberg orport=443 "
+  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
+"maatuska orport=80 "
+  "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
+  "ipv6=[2001:67c:289c::9]:80 "
+  "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
+"Faravahar orport=443 "
+  "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
+  "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
+"longclaw orport=443 "
+  "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
+  "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
+"bastet orport=443 "
+  "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+  "ipv6=[2620:13:4000:6000::1000:118]:443 "
+  "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
diff --git a/src/or/config.c b/src/or/config.c
index 3b4027433..75e406585 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -967,39 +967,7 @@ escaped_safe_str(const char *address)
 /** List of default directory authorities */
 
 static const char *default_authorities[] = {
-  "moria1 orport=9101 "
-"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
-"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
-  "tor26 orport=443 "
-"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
-"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
-"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
-  "dizum orport=443 "
-"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Bifroest orport=443 bridge "
-"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
-  "gabelmoo orport=443 "
-"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
-"ipv6=[2001:638:a000:4140:::189]:443 "
-"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
-  "dannenberg orport=443 "
-"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
-"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-  "maatuska orport=80 "
-"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
-"ipv6=[2001:67c:289c::9]:80 "
-"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
-  "Faravahar orport=443 "
-"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
-"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
-  "longclaw orport=443 "
-"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
-"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
-  "bastet orport=443 "
-"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
-"ipv6=[2620:13:4000:6000::1000:118]:443 "
-"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
+#include "auth_dirs.inc"
   NULL
 };
 
diff --git a/src/or/include.am b/src/or/include.am
index 5108a08e5..19cf00264 100644
--- a/src/or/include.am
+++

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

2018-04-10 Thread nickm

commit 10a1969ca327c517e20aeefdc86f88c95322289d
Merge: b68e636b3 1295044dc
Author: Nick Mathewson 
Date:   Tue Apr 10 14:25:57 2018 -0400

Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.1] Lift the list of default directory servers into their own file.

2018-04-10 Thread nickm

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Apr 6 03:58:16 2018 +0200

Lift the list of default directory servers into their own file.

This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.

Patch by beastr0.

See: https://bugs.torproject.org/24854
---
 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/changes/bug24854 b/changes/bug24854
new file mode 100644
index 0..64e10772e
--- /dev/null
+++ b/changes/bug24854
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Move the list of default directory authorities to their own file for
+  inclusion using the C preprocessor. Closes ticket 24854. Patch by 
"beastr0".
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
new file mode 100644
index 0..58e6817c8
--- /dev/null
+++ b/src/or/auth_dirs.inc
@@ -0,0 +1,33 @@
+"moria1 orport=9101 "
+  "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
+  "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
+"tor26 orport=443 "
+  "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
+  "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
+  "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
+"dizum orport=443 "
+  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
+  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+"Bifroest orport=443 bridge "
+  "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
+"gabelmoo orport=443 "
+  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
+  "ipv6=[2001:638:a000:4140:::189]:443 "
+  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
+"dannenberg orport=443 "
+  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
+"maatuska orport=80 "
+  "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
+  "ipv6=[2001:67c:289c::9]:80 "
+  "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
+"Faravahar orport=443 "
+  "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
+  "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
+"longclaw orport=443 "
+  "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
+  "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
+"bastet orport=443 "
+  "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+  "ipv6=[2620:13:4000:6000::1000:118]:443 "
+  "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
diff --git a/src/or/config.c b/src/or/config.c
index 3b4027433..75e406585 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -967,39 +967,7 @@ escaped_safe_str(const char *address)
 /** List of default directory authorities */
 
 static const char *default_authorities[] = {
-  "moria1 orport=9101 "
-"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
-"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
-  "tor26 orport=443 "
-"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
-"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
-"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
-  "dizum orport=443 "
-"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Bifroest orport=443 bridge "
-"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
-  "gabelmoo orport=443 "
-"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
-"ipv6=[2001:638:a000:4140:::189]:443 "
-"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
-  "dannenberg orport=443 "
-"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
-"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-  "maatuska orport=80 "
-"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
-"ipv6=[2001:67c:289c::9]:80 "
-"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
-  "Faravahar orport=443 "
-"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
-"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
-  "longclaw orport=443 "
-"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
-"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
-  "bastet orport=443 "
-"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
-"ipv6=[2620:13:4000:6000::1000:118]:443 "
-"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
+#include "auth_dirs.inc"
   NULL
 };
 
diff --git a/src/or/include.am b/src/or/include.am
index 5108a08e5..19cf00264 100644
--- a/src/or/include.am
+++

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-04-10 Thread nickm

commit 0b1a054d68f4ebb760add6d3a1bda75fb8b17553
Merge: 306563ac6 d3ac47b41
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.1' into maint-0.3.2

2018-04-10 Thread nickm

commit d3ac47b4153fbe51ca63882ce63165abdf50901b
Merge: 124e06e85 db6902c23
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index abf62c2e8,7548ed094..4938ae8e7
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -156,7 -144,9 +156,8 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
src/or/bridges.h\
 -  src/or/buffers.h\
src/or/channel.h\
src/or/channelpadding.h \
src/or/channeltls.h \



___
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.3'

2018-04-10 Thread nickm

commit ef16a11b90a107c6bc5178af1cbd083f80b39842
Merge: 395fa0258 0b1a054d6
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.3'

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.2' into maint-0.3.3

2018-04-10 Thread nickm

commit 0b1a054d68f4ebb760add6d3a1bda75fb8b17553
Merge: 306563ac6 d3ac47b41
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.3] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

2018-04-10 Thread nickm

commit 10a1969ca327c517e20aeefdc86f88c95322289d
Merge: b68e636b3 1295044dc
Author: Nick Mathewson 
Date:   Tue Apr 10 14:25:57 2018 -0400

Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.1] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-04-10 Thread nickm

commit db6902c23530f8d58e999701685e9cbd74b15a82
Merge: e813116d3 10a1969ca
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:29 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index 5d5ff5c41,19cf00264..7548ed094
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -144,10 -127,9 +144,11 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
 +  src/or/bridges.h\
src/or/buffers.h\
src/or/channel.h\
 +  src/or/channelpadding.h \
src/or/channeltls.h \
src/or/circpathbias.h   \
src/or/circuitbuild.h   \



___
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.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-04-10 Thread nickm

commit d3ac47b4153fbe51ca63882ce63165abdf50901b
Merge: 124e06e85 db6902c23
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index abf62c2e8,7548ed094..4938ae8e7
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -156,7 -144,9 +156,8 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
src/or/bridges.h\
 -  src/or/buffers.h\
src/or/channel.h\
src/or/channelpadding.h \
src/or/channeltls.h \



___
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] Lift the list of default directory servers into their own file.

2018-04-10 Thread nickm

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Apr 6 03:58:16 2018 +0200

Lift the list of default directory servers into their own file.

This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.

Patch by beastr0.

See: https://bugs.torproject.org/24854
---
 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/changes/bug24854 b/changes/bug24854
new file mode 100644
index 0..64e10772e
--- /dev/null
+++ b/changes/bug24854
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Move the list of default directory authorities to their own file for
+  inclusion using the C preprocessor. Closes ticket 24854. Patch by 
"beastr0".
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
new file mode 100644
index 0..58e6817c8
--- /dev/null
+++ b/src/or/auth_dirs.inc
@@ -0,0 +1,33 @@
+"moria1 orport=9101 "
+  "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
+  "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
+"tor26 orport=443 "
+  "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
+  "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
+  "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
+"dizum orport=443 "
+  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
+  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+"Bifroest orport=443 bridge "
+  "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
+"gabelmoo orport=443 "
+  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
+  "ipv6=[2001:638:a000:4140:::189]:443 "
+  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
+"dannenberg orport=443 "
+  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
+"maatuska orport=80 "
+  "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
+  "ipv6=[2001:67c:289c::9]:80 "
+  "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
+"Faravahar orport=443 "
+  "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
+  "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
+"longclaw orport=443 "
+  "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
+  "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
+"bastet orport=443 "
+  "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+  "ipv6=[2620:13:4000:6000::1000:118]:443 "
+  "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
diff --git a/src/or/config.c b/src/or/config.c
index 3b4027433..75e406585 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -967,39 +967,7 @@ escaped_safe_str(const char *address)
 /** List of default directory authorities */
 
 static const char *default_authorities[] = {
-  "moria1 orport=9101 "
-"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
-"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
-  "tor26 orport=443 "
-"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
-"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
-"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
-  "dizum orport=443 "
-"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Bifroest orport=443 bridge "
-"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
-  "gabelmoo orport=443 "
-"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
-"ipv6=[2001:638:a000:4140:::189]:443 "
-"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
-  "dannenberg orport=443 "
-"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
-"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-  "maatuska orport=80 "
-"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
-"ipv6=[2001:67c:289c::9]:80 "
-"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
-  "Faravahar orport=443 "
-"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
-"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
-  "longclaw orport=443 "
-"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
-"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
-  "bastet orport=443 "
-"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
-"ipv6=[2620:13:4000:6000::1000:118]:443 "
-"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
+#include "auth_dirs.inc"
   NULL
 };
 
diff --git a/src/or/include.am b/src/or/include.am
index 5108a08e5..19cf00264 100644
--- a/src/or/include.am
+++

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-04-10 Thread nickm

commit 5a2232e62733aa6096f38271d883b9bedf63a87c
Merge: 8a363a7c8 10a1969ca
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:01 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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 remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

2018-04-10 Thread nickm

commit 10a1969ca327c517e20aeefdc86f88c95322289d
Merge: b68e636b3 1295044dc
Author: Nick Mathewson 
Date:   Tue Apr 10 14:25:57 2018 -0400

Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Lift the list of default directory servers into their own file.

2018-04-10 Thread nickm

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Apr 6 03:58:16 2018 +0200

Lift the list of default directory servers into their own file.

This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.

Patch by beastr0.

See: https://bugs.torproject.org/24854
---
 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/changes/bug24854 b/changes/bug24854
new file mode 100644
index 0..64e10772e
--- /dev/null
+++ b/changes/bug24854
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Move the list of default directory authorities to their own file for
+  inclusion using the C preprocessor. Closes ticket 24854. Patch by 
"beastr0".
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
new file mode 100644
index 0..58e6817c8
--- /dev/null
+++ b/src/or/auth_dirs.inc
@@ -0,0 +1,33 @@
+"moria1 orport=9101 "
+  "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
+  "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
+"tor26 orport=443 "
+  "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
+  "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
+  "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
+"dizum orport=443 "
+  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
+  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+"Bifroest orport=443 bridge "
+  "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
+"gabelmoo orport=443 "
+  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
+  "ipv6=[2001:638:a000:4140:::189]:443 "
+  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
+"dannenberg orport=443 "
+  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
+"maatuska orport=80 "
+  "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
+  "ipv6=[2001:67c:289c::9]:80 "
+  "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
+"Faravahar orport=443 "
+  "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
+  "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
+"longclaw orport=443 "
+  "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
+  "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
+"bastet orport=443 "
+  "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+  "ipv6=[2620:13:4000:6000::1000:118]:443 "
+  "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
diff --git a/src/or/config.c b/src/or/config.c
index 3b4027433..75e406585 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -967,39 +967,7 @@ escaped_safe_str(const char *address)
 /** List of default directory authorities */
 
 static const char *default_authorities[] = {
-  "moria1 orport=9101 "
-"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
-"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
-  "tor26 orport=443 "
-"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
-"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
-"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
-  "dizum orport=443 "
-"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Bifroest orport=443 bridge "
-"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
-  "gabelmoo orport=443 "
-"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
-"ipv6=[2001:638:a000:4140:::189]:443 "
-"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
-  "dannenberg orport=443 "
-"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
-"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-  "maatuska orport=80 "
-"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
-"ipv6=[2001:67c:289c::9]:80 "
-"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
-  "Faravahar orport=443 "
-"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
-"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
-  "longclaw orport=443 "
-"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
-"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
-  "bastet orport=443 "
-"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
-"ipv6=[2620:13:4000:6000::1000:118]:443 "
-"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
+#include "auth_dirs.inc"
   NULL
 };
 
diff --git a/src/or/include.am b/src/or/include.am
index 5108a08e5..19cf00264 100644
--- a/src/or/include.am
+++

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-04-10 Thread nickm

commit db6902c23530f8d58e999701685e9cbd74b15a82
Merge: e813116d3 10a1969ca
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:29 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index 5d5ff5c41,19cf00264..7548ed094
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -144,10 -127,9 +144,11 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
 +  src/or/bridges.h\
src/or/buffers.h\
src/or/channel.h\
 +  src/or/channelpadding.h \
src/or/channeltls.h \
src/or/circpathbias.h   \
src/or/circuitbuild.h   \



___
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.3] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-04-10 Thread nickm

commit db6902c23530f8d58e999701685e9cbd74b15a82
Merge: e813116d3 10a1969ca
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:29 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index 5d5ff5c41,19cf00264..7548ed094
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -144,10 -127,9 +144,11 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
 +  src/or/bridges.h\
src/or/buffers.h\
src/or/channel.h\
 +  src/or/channelpadding.h \
src/or/channeltls.h \
src/or/circpathbias.h   \
src/or/circuitbuild.h   \



___
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.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-04-10 Thread nickm

commit d3ac47b4153fbe51ca63882ce63165abdf50901b
Merge: 124e06e85 db6902c23
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index abf62c2e8,7548ed094..4938ae8e7
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -156,7 -144,9 +156,8 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
src/or/bridges.h\
 -  src/or/buffers.h\
src/or/channel.h\
src/or/channelpadding.h \
src/or/channeltls.h \



___
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.2] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

2018-04-10 Thread nickm

commit 10a1969ca327c517e20aeefdc86f88c95322289d
Merge: b68e636b3 1295044dc
Author: Nick Mathewson 
Date:   Tue Apr 10 14:25:57 2018 -0400

Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-04-10 Thread nickm

commit d3ac47b4153fbe51ca63882ce63165abdf50901b
Merge: 124e06e85 db6902c23
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index abf62c2e8,7548ed094..4938ae8e7
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -156,7 -144,9 +156,8 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
src/or/bridges.h\
 -  src/or/buffers.h\
src/or/channel.h\
src/or/channelpadding.h \
src/or/channeltls.h \

___
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.2] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-04-10 Thread nickm

commit db6902c23530f8d58e999701685e9cbd74b15a82
Merge: e813116d3 10a1969ca
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:29 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index 5d5ff5c41,19cf00264..7548ed094
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -144,10 -127,9 +144,11 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
 +  src/or/bridges.h\
src/or/buffers.h\
src/or/channel.h\
 +  src/or/channelpadding.h \
src/or/channeltls.h \
src/or/circpathbias.h   \
src/or/circuitbuild.h   \



___
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.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-04-10 Thread nickm

commit 0b1a054d68f4ebb760add6d3a1bda75fb8b17553
Merge: 306563ac6 d3ac47b41
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.2] Lift the list of default directory servers into their own file.

2018-04-10 Thread nickm

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Apr 6 03:58:16 2018 +0200

Lift the list of default directory servers into their own file.

This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.

Patch by beastr0.

See: https://bugs.torproject.org/24854
---
 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/changes/bug24854 b/changes/bug24854
new file mode 100644
index 0..64e10772e
--- /dev/null
+++ b/changes/bug24854
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Move the list of default directory authorities to their own file for
+  inclusion using the C preprocessor. Closes ticket 24854. Patch by 
"beastr0".
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
new file mode 100644
index 0..58e6817c8
--- /dev/null
+++ b/src/or/auth_dirs.inc
@@ -0,0 +1,33 @@
+"moria1 orport=9101 "
+  "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
+  "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
+"tor26 orport=443 "
+  "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
+  "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
+  "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
+"dizum orport=443 "
+  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
+  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+"Bifroest orport=443 bridge "
+  "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
+"gabelmoo orport=443 "
+  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
+  "ipv6=[2001:638:a000:4140:::189]:443 "
+  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
+"dannenberg orport=443 "
+  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
+"maatuska orport=80 "
+  "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
+  "ipv6=[2001:67c:289c::9]:80 "
+  "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
+"Faravahar orport=443 "
+  "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
+  "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
+"longclaw orport=443 "
+  "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
+  "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
+"bastet orport=443 "
+  "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+  "ipv6=[2620:13:4000:6000::1000:118]:443 "
+  "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
diff --git a/src/or/config.c b/src/or/config.c
index 3b4027433..75e406585 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -967,39 +967,7 @@ escaped_safe_str(const char *address)
 /** List of default directory authorities */
 
 static const char *default_authorities[] = {
-  "moria1 orport=9101 "
-"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
-"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
-  "tor26 orport=443 "
-"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
-"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
-"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
-  "dizum orport=443 "
-"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Bifroest orport=443 bridge "
-"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
-  "gabelmoo orport=443 "
-"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
-"ipv6=[2001:638:a000:4140:::189]:443 "
-"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
-  "dannenberg orport=443 "
-"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
-"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-  "maatuska orport=80 "
-"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
-"ipv6=[2001:67c:289c::9]:80 "
-"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
-  "Faravahar orport=443 "
-"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
-"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
-  "longclaw orport=443 "
-"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
-"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
-  "bastet orport=443 "
-"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
-"ipv6=[2620:13:4000:6000::1000:118]:443 "
-"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
+#include "auth_dirs.inc"
   NULL
 };
 
diff --git a/src/or/include.am b/src/or/include.am
index 5108a08e5..19cf00264 100644
--- a/src/or/include.am
+++

[tor-commits] [tor/maint-0.2.9] Lift the list of default directory servers into their own file.

2018-04-10 Thread nickm

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Apr 6 03:58:16 2018 +0200

Lift the list of default directory servers into their own file.

This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.

Patch by beastr0.

See: https://bugs.torproject.org/24854
---
 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/changes/bug24854 b/changes/bug24854
new file mode 100644
index 0..64e10772e
--- /dev/null
+++ b/changes/bug24854
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Move the list of default directory authorities to their own file for
+  inclusion using the C preprocessor. Closes ticket 24854. Patch by 
"beastr0".
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
new file mode 100644
index 0..58e6817c8
--- /dev/null
+++ b/src/or/auth_dirs.inc
@@ -0,0 +1,33 @@
+"moria1 orport=9101 "
+  "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
+  "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
+"tor26 orport=443 "
+  "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
+  "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
+  "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
+"dizum orport=443 "
+  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
+  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+"Bifroest orport=443 bridge "
+  "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
+"gabelmoo orport=443 "
+  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
+  "ipv6=[2001:638:a000:4140:::189]:443 "
+  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
+"dannenberg orport=443 "
+  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
+"maatuska orport=80 "
+  "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
+  "ipv6=[2001:67c:289c::9]:80 "
+  "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
+"Faravahar orport=443 "
+  "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
+  "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
+"longclaw orport=443 "
+  "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
+  "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
+"bastet orport=443 "
+  "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+  "ipv6=[2620:13:4000:6000::1000:118]:443 "
+  "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
diff --git a/src/or/config.c b/src/or/config.c
index 3b4027433..75e406585 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -967,39 +967,7 @@ escaped_safe_str(const char *address)
 /** List of default directory authorities */
 
 static const char *default_authorities[] = {
-  "moria1 orport=9101 "
-"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
-"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
-  "tor26 orport=443 "
-"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
-"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
-"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
-  "dizum orport=443 "
-"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Bifroest orport=443 bridge "
-"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
-  "gabelmoo orport=443 "
-"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
-"ipv6=[2001:638:a000:4140:::189]:443 "
-"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
-  "dannenberg orport=443 "
-"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
-"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-  "maatuska orport=80 "
-"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
-"ipv6=[2001:67c:289c::9]:80 "
-"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
-  "Faravahar orport=443 "
-"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
-"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
-  "longclaw orport=443 "
-"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
-"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
-  "bastet orport=443 "
-"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
-"ipv6=[2620:13:4000:6000::1000:118]:443 "
-"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
+#include "auth_dirs.inc"
   NULL
 };
 
diff --git a/src/or/include.am b/src/or/include.am
index 5108a08e5..19cf00264 100644
--- a/src/or/include.am
+++

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

2018-04-10 Thread nickm

commit 10a1969ca327c517e20aeefdc86f88c95322289d
Merge: b68e636b3 1295044dc
Author: Nick Mathewson 
Date:   Tue Apr 10 14:25:57 2018 -0400

Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.3] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-04-10 Thread nickm

commit db6902c23530f8d58e999701685e9cbd74b15a82
Merge: e813116d3 10a1969ca
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:29 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index 5d5ff5c41,19cf00264..7548ed094
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -144,10 -127,9 +144,11 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
 +  src/or/bridges.h\
src/or/buffers.h\
src/or/channel.h\
 +  src/or/channelpadding.h \
src/or/channeltls.h \
src/or/circpathbias.h   \
src/or/circuitbuild.h   \



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

2018-04-10 Thread nickm

commit 10a1969ca327c517e20aeefdc86f88c95322289d
Merge: b68e636b3 1295044dc
Author: Nick Mathewson 
Date:   Tue Apr 10 14:25:57 2018 -0400

Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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 remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

2018-04-10 Thread nickm

commit 10a1969ca327c517e20aeefdc86f88c95322289d
Merge: b68e636b3 1295044dc
Author: Nick Mathewson 
Date:   Tue Apr 10 14:25:57 2018 -0400

Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.1

2018-04-10 Thread nickm

commit db6902c23530f8d58e999701685e9cbd74b15a82
Merge: e813116d3 10a1969ca
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:29 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index 5d5ff5c41,19cf00264..7548ed094
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -144,10 -127,9 +144,11 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
 +  src/or/bridges.h\
src/or/buffers.h\
src/or/channel.h\
 +  src/or/channelpadding.h \
src/or/channeltls.h \
src/or/circpathbias.h   \
src/or/circuitbuild.h   \



___
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.1] Lift the list of default directory servers into their own file.

2018-04-10 Thread nickm

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Apr 6 03:58:16 2018 +0200

Lift the list of default directory servers into their own file.

This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.

Patch by beastr0.

See: https://bugs.torproject.org/24854
---
 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/changes/bug24854 b/changes/bug24854
new file mode 100644
index 0..64e10772e
--- /dev/null
+++ b/changes/bug24854
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Move the list of default directory authorities to their own file for
+  inclusion using the C preprocessor. Closes ticket 24854. Patch by 
"beastr0".
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
new file mode 100644
index 0..58e6817c8
--- /dev/null
+++ b/src/or/auth_dirs.inc
@@ -0,0 +1,33 @@
+"moria1 orport=9101 "
+  "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
+  "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
+"tor26 orport=443 "
+  "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
+  "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
+  "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
+"dizum orport=443 "
+  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
+  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+"Bifroest orport=443 bridge "
+  "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
+"gabelmoo orport=443 "
+  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
+  "ipv6=[2001:638:a000:4140:::189]:443 "
+  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
+"dannenberg orport=443 "
+  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
+"maatuska orport=80 "
+  "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
+  "ipv6=[2001:67c:289c::9]:80 "
+  "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
+"Faravahar orport=443 "
+  "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
+  "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
+"longclaw orport=443 "
+  "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
+  "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
+"bastet orport=443 "
+  "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+  "ipv6=[2620:13:4000:6000::1000:118]:443 "
+  "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
diff --git a/src/or/config.c b/src/or/config.c
index 3b4027433..75e406585 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -967,39 +967,7 @@ escaped_safe_str(const char *address)
 /** List of default directory authorities */
 
 static const char *default_authorities[] = {
-  "moria1 orport=9101 "
-"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
-"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
-  "tor26 orport=443 "
-"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
-"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
-"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
-  "dizum orport=443 "
-"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Bifroest orport=443 bridge "
-"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
-  "gabelmoo orport=443 "
-"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
-"ipv6=[2001:638:a000:4140:::189]:443 "
-"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
-  "dannenberg orport=443 "
-"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
-"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-  "maatuska orport=80 "
-"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
-"ipv6=[2001:67c:289c::9]:80 "
-"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
-  "Faravahar orport=443 "
-"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
-"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
-  "longclaw orport=443 "
-"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
-"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
-  "bastet orport=443 "
-"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
-"ipv6=[2620:13:4000:6000::1000:118]:443 "
-"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
+#include "auth_dirs.inc"
   NULL
 };
 
diff --git a/src/or/include.am b/src/or/include.am
index 5108a08e5..19cf00264 100644
--- a/src/or/include.am
+++

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-04-10 Thread nickm

commit db6902c23530f8d58e999701685e9cbd74b15a82
Merge: e813116d3 10a1969ca
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:29 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index 5d5ff5c41,19cf00264..7548ed094
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -144,10 -127,9 +144,11 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
 +  src/or/bridges.h\
src/or/buffers.h\
src/or/channel.h\
 +  src/or/channelpadding.h \
src/or/channeltls.h \
src/or/circpathbias.h   \
src/or/circuitbuild.h   \

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] Add is_hidden_service_dir to server descriptors

2018-04-10 Thread atagar

commit 906c998ab7eee705a33e738fc401dfde04cf882c
Author: Damian Johnson 
Date:   Tue Apr 10 09:36:58 2018 -0700

Add is_hidden_service_dir to server descriptors

The hidden service directory version is obsolete, but the presence or lack 
of
'hidden-service-dir' lines are still meaningful...

  https://gitweb.torproject.org/torspec.git/commit/?id=43c2f78

Adding a boolean attribute indicate if we have the flag.

Noticed this thanks to our static checks, which informed me I buggered up my
earlier change by ignoring the descriptor's data...

  STATIC CHECKS
  * /home/atagar/Desktop/stem/stem/descriptor/server_descriptor.py
line 342  - local variable 'value' is assigned to but never used | 
value = _value('hidden-service-dir', entries)
---
 docs/change_log.rst   |  1 +
 stem/descriptor/server_descriptor.py  | 24 +---
 test/unit/descriptor/server_descriptor.py | 12 +++-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index a67aae2d..b0773382 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -56,6 +56,7 @@ The following are only available within Stem's `git repository
 
   * `Fallback directory v2 support 
`_, 
which adds *nickname* and *extrainfo*
   * Added zstd and lzma compression support (:spec:`1cb56af`)
+  * Added server descriptor's new is_hidden_service_dir attribute
   * Reduced maximum descriptors fetched by the remote module to match tor's 
new limit (:trac:`24743`)
   * Consensus **shared_randomness_*_reveal_count** attributes undocumented, 
and unavailable if retrieved before their corresponding 
shared_randomness_*_value attribute (:trac:`25046`)
   * Allow 'proto' line to have blank values (:spec:`a8455f4`)
diff --git a/stem/descriptor/server_descriptor.py 
b/stem/descriptor/server_descriptor.py
index 4f2bcbec..63a3d069 100644
--- a/stem/descriptor/server_descriptor.py
+++ b/stem/descriptor/server_descriptor.py
@@ -338,16 +338,6 @@ def _parse_hibernating_line(descriptor, entries):
   descriptor.hibernating = value == '1'
 
 
-def _parse_hidden_service_dir_line(descriptor, entries):
-  value = _value('hidden-service-dir', entries)
-
-  # TODO: Remove the following field in Stem 2.0. It has never been 
populated...
-  #
-  #   https://gitweb.torproject.org/torspec.git/commit/?id=43c2f78
-
-  descriptor.hidden_service_dir = ['2']
-
-
 def _parse_uptime_line(descriptor, entries):
   # We need to be tolerant of negative uptimes to accommodate a past tor
   # bug...
@@ -450,6 +440,7 @@ _parse_ipv6_policy_line = _parse_simple_line('ipv6-policy', 
'exit_policy_v6', fu
 _parse_allow_single_hop_exits_line = 
_parse_if_present('allow-single-hop-exits', 'allow_single_hop_exits')
 _parse_tunneled_dir_server_line = _parse_if_present('tunnelled-dir-server', 
'allow_tunneled_dir_requests')
 _parse_proto_line = _parse_protocol_line('proto', 'protocols')
+_parse_hidden_service_dir_line = _parse_if_present('hidden-service-dir', 
'is_hidden_service_dir')
 _parse_caches_extra_info_line = _parse_if_present('caches-extra-info', 
'extra_info_cache')
 _parse_bridge_distribution_request_line = 
_parse_simple_line('bridge-distribution-request', 'bridge_distribution')
 _parse_family_line = _parse_simple_line('family', 'family', func = lambda v: 
set(v.split(' ')))
@@ -495,6 +486,8 @@ class ServerDescriptor(Descriptor):
 
   :var list link_protocols: link protocols supported by the relay
   :var list circuit_protocols: circuit protocols supported by the relay
+  :var bool is_hidden_service_dir: **\*** indicates if the relay serves hidden
+service descriptors
   :var bool hibernating: **\*** hibernating when published
   :var bool allow_single_hop_exits: **\*** flag if single hop exiting is 
allowed
   :var bool allow_tunneled_dir_requests: **\*** flag if tunneled directory
@@ -530,6 +523,9 @@ class ServerDescriptor(Descriptor):
  attributes.
 
   .. versionchanged:: 1.7.0
+ Added the is_hidden_service_dir attribute.
+
+  .. versionchanged:: 1.7.0
  Deprecated the hidden_service_dir field, it's never been populated
  (:spec:`43c2f78`). This field will be removed in Stem 2.0.
   """
@@ -560,6 +556,7 @@ class ServerDescriptor(Descriptor):
 
 'link_protocols': (None, _parse_protocols_line),
 'circuit_protocols': (None, _parse_protocols_line),
+'is_hidden_service_dir': (False, _parse_hidden_service_dir_line),
 'hibernating': (False, _parse_hibernating_line),
 'allow_single_hop_exits': (False, _parse_allow_single_hop_exits_line),
 'allow_tunneled_dir_requests': (False, _parse_tunneled_dir_server_line),
@@ -567,7 +564,6 @@ class ServerDescriptor(Descriptor):
 'extra_info_cache': (False, _parse_caches_extra_info_line),
 'extra_info_digest': (None, _parse_extrainfo_digest_line),

[tor-commits] [stem/master] Offline (i.e. not ONLINE) integ tests only wait for 0% bootstrapping (Fixes: #25757)

2018-04-10 Thread atagar

commit 16a5983581568dea6f32d43de78867d0796f2bb4
Author: Dave Rolek 
Date:   Tue Apr 10 00:52:36 2018 +

Offline (i.e. not ONLINE) integ tests only wait for 0% bootstrapping 
(Fixes: #25757)

Empirically, all not-ONLINE-target integ tests worked at 0%
bootstrapping.
Changing this value from 5% to 0% allows tests to run without any
network access.
---
 test/runner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/runner.py b/test/runner.py
index 67d12dd7..bd3fe8a4 100644
--- a/test/runner.py
+++ b/test/runner.py
@@ -608,7 +608,7 @@ class Runner(object):
   self._tor_process = stem.process.launch_tor(
 tor_cmd = tor_cmd,
 torrc_path = os.path.join(self._test_dir, 'torrc'),
-completion_percent = 100 if test.Target.ONLINE in 
self.attribute_targets else 5,
+completion_percent = 100 if test.Target.ONLINE in 
self.attribute_targets else 0,
 init_msg_handler = lambda line: println('  %s' % line, SUBSTATUS),
 take_ownership = True,
   )

___
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

2018-04-10 Thread translation

commit 1cb7e1cb07ec448ad862446109a9c141ae3ac3ac
Author: Translation commit bot 
Date:   Tue Apr 10 16:15:32 2018 +

Update translations for https_everywhere
---
 zh_CN/https-everywhere.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd
index 43dce6f01..d05ac555e 100644
--- a/zh_CN/https-everywhere.dtd
+++ b/zh_CN/https-everywhere.dtd
@@ -16,8 +16,8 @@
 
 
 
-
-
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-tbb] Update translations for support-tbb

2018-04-10 Thread translation

commit 10b836d2bbef5ee1b594a5360bfca678812da194
Author: Translation commit bot 
Date:   Tue Apr 10 15:50:23 2018 +

Update translations for support-tbb
---
 ga.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ga.json b/ga.json
index ee311133e..f76ecde4a 100644
--- a/ga.json
+++ b/ga.json
@@ -201,7 +201,7 @@
"id": "#tbb-33",
"control": "tbb-33",
"title": "An ndÃ©antar athsheachadÃ¡n de mo rÃomhaire nuair a 
ÃºsÃ¡idim BrabhsÃ¡laÃ Tor?",
-   "description": "Running Tor Browser does not make you 
act as a relay in the network. This means that your computer will not be used 
to route traffic for others. If you'd like to become a relay, please see our 
https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\;>Tor Relay 
Guide."
+   "description": "NÃ dhÃ©antar. NÃ ÃºsÃ¡idfear do 
rÃomhaire chun trÃ¡cht a stiÃºradh ar son daoine eile. MÃ¡ tÃ¡ tÃº ag iarraidh 
a bheith i d'athsheachadÃ¡n, fÃ©ach ar https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\;>LÃ¡mhleabhar
 AthsheachadÃ¡n Tor."
 },
 "tbb-34": {
"id": "#tbb-34",

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2018-04-10 Thread translation

commit 529ce58357f4cd23a7875953b2a28db19a02188d
Author: Translation commit bot 
Date:   Tue Apr 10 15:19:22 2018 +

Update translations for tails-greeter-2
---
 th/th.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/th/th.po b/th/th.po
index dcba6c503..cc4f6d993 100644
--- a/th/th.po
+++ b/th/th.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-22 14:15+0100\n"
+"POT-Creation-Date: 2018-03-01 20:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: kanesayan gwangsai , 
2016\n"
 "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2018-04-10 Thread translation

commit 8d3aee869d8a370fd8ef6343163227fb9bd6b9b9
Author: Translation commit bot 
Date:   Tue Apr 10 09:46:46 2018 +

Update translations for tails-misc_completed
---
 pt_BR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index 7c1390a28..0accbbd12 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -23,8 +23,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-03-28 21:48+\n"
-"Last-Translator: Communia \n"
+"PO-Revision-Date: 2018-04-10 09:40+\n"
+"Last-Translator: FlÃ¡vio Veras \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-04-10 Thread translation

commit ccb0f4473bea1d2ae3a80a2cb37b101e1508
Author: Translation commit bot 
Date:   Tue Apr 10 09:46:40 2018 +

Update translations for tails-misc
---
 pt_BR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index 7c1390a28..0accbbd12 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -23,8 +23,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-03-28 21:48+\n"
-"Last-Translator: Communia \n"
+"PO-Revision-Date: 2018-04-10 09:40+\n"
+"Last-Translator: FlÃ¡vio Veras \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-topics_completed] Update translations for support-topics_completed

2018-04-10 Thread translation

commit b2c92895bf7ed791fb6b6ff039f0106e94235976
Author: Translation commit bot 
Date:   Tue Apr 10 08:51:20 2018 +

Update translations for support-topics_completed
---
 uk.json | 57 +
 1 file changed, 57 insertions(+)

diff --git a/uk.json b/uk.json
new file mode 100644
index 0..9438fda66
--- /dev/null
+++ b/uk.json
@@ -0,0 +1,57 @@
+{
+"faq": {
+   "path": "#Ð§ÐÐ",
+   "control": "Ð§ÐÐ",
+   "label": "ÐÐ°Ð¹Ð±ÑÐ»ÑÑ Ð§ÐÑÑÑ ÐÐ¸ÑÐ°Ð½Ð½Ñ"
+},
+"tbb": {
+   "path": "#tor-Ð±ÑÐ°ÑÐ·ÐµÑ",
+   "control": "tor-Ð±ÑÐ°ÑÐ·ÐµÑ",
+   "label": "Tor Ð±ÑÐ°ÑÐ·ÐµÑ"
+},
+"tormessenger": {
+   "path": "#tor-messenger",
+   "control": "tor-messenger",
+   "label": "Tor Messenger"
+},
+"tormobile": {
+   "path": "#Ð¼Ð¾Ð±ÑÐ»ÑÐ½Ð¸Ð¹-tor",
+   "control": "Ð¼Ð¾Ð±ÑÐ»ÑÐ½Ð¸Ð¹-tor",
+   "label": "ÐÐ¾Ð±ÑÐ»ÑÐ½Ð¸Ð¹ Tor"
+},
+"gettor": {
+   "path": "#Ð¾ÑÑÐ¸Ð¼Ð°ÑÐ¸ÑÐ¾Ñ",
+   "control": "Ð¾ÑÑÐ¸Ð¼Ð°ÑÐ¸ÑÐ¾Ñ",
+   "label": "GetTor"
+},
+"connecting": {
+   "path": "#Ð¿ÑÐ´'ÑÐ´Ð½Ð°Ð½Ð½Ñ-Ð´Ð¾-tor",
+   "control": "Ð¿ÑÐ´'ÑÐ´Ð½Ð°Ð½Ð½Ñ-Ð´Ð¾-tor",
+   "label": "ÐÑÐ´'ÑÐ´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ Tor"
+},
+"censorship": {
+   "path": "#ÑÐµÐ½Ð·ÑÑÐ°",
+   "control": "ÑÐµÐ½Ð·ÑÑÐ°",
+   "label": "Ð¦ÐµÐ½Ð·ÑÑÐ°"
+},
+"https": {
+   "path": "#https",
+   "control": "https",
+   "label": "HTTPS"
+},
+"operators": {
+   "path": "#Ð¾Ð¿ÐµÑÐ°ÑÐ¾ÑÐ¸",
+   "control": "Ð¾Ð¿ÐµÑÐ°ÑÐ¾ÑÐ¸",
+   "label": "ÐÐ¿ÐµÑÐ°ÑÐ¾ÑÐ¸"
+},
+"onionservices": {
+   "path": "#ÑÐ»ÑÐ¶Ð±Ð¸-onion",
+   "control": "ÑÐ»ÑÐ¶Ð±Ð¸-onion",
+   "label": "Ð¡Ð»ÑÐ¶Ð±Ð¸ Onion"
+},
+"miscellaneus": {
+   "path": "#ÑÑÐ·Ð½Ðµ",
+   "control": "ÑÑÐ·Ð½Ðµ",
+   "label": "Ð ÑÐ·Ð½Ðµ"
+}
+}

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-topics] Update translations for support-topics

2018-04-10 Thread translation

commit ddb66b949f1b3d3158bbf8954ad95f4a9ac9e080
Author: Translation commit bot 
Date:   Tue Apr 10 08:51:15 2018 +

Update translations for support-topics
---
 uk.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uk.json b/uk.json
index 3a3497d39..9438fda66 100644
--- a/uk.json
+++ b/uk.json
@@ -50,8 +50,8 @@
"label": "Ð¡Ð»ÑÐ¶Ð±Ð¸ Onion"
 },
 "miscellaneus": {
-   "path": "#miscellaneus",
-   "control": "miscellaneus",
-   "label": "Miscellaneus"
+   "path": "#ÑÑÐ·Ð½Ðµ",
+   "control": "ÑÑÐ·Ð½Ðµ",
+   "label": "Ð ÑÐ·Ð½Ðµ"
 }
 }

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Bug 23384: Add user arthuredelstein on build-sunet-a.torproject.net

2018-04-10 Thread boklm

commit 76319b785d20d8d7103aa1d850716b3cd52396b4
Author: Nicolas Vigier 
Date:   Tue Apr 10 10:49:10 2018 +0200

Bug 23384: Add user arthuredelstein on build-sunet-a.torproject.net
---
 tools/ansible/roles/tbb-team/defaults/main.yml | 1 +
 tools/ansible/roles/tbb-team/files/arthuredelstein.pub | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml 
b/tools/ansible/roles/tbb-team/defaults/main.yml
index dd92149..1445fce 100644
--- a/tools/ansible/roles/tbb-team/defaults/main.yml
+++ b/tools/ansible/roles/tbb-team/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
 tbb_team_members:
+- arthuredelstein
 - boklm
 - brade
 - gk
diff --git a/tools/ansible/roles/tbb-team/files/arthuredelstein.pub 
b/tools/ansible/roles/tbb-team/files/arthuredelstein.pub
new file mode 100644
index 000..e7f0c39
--- /dev/null
+++ b/tools/ansible/roles/tbb-team/files/arthuredelstein.pub
@@ -0,0 +1 @@
+ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDTn6K3kVN90fKK4BFC2I6wU9Ngb0v1U9JG9Ongt8UlTnbT58tLXATj65a7JwLcFHTjfTyDe2YLA5ujec2Az9LVYNezf4lIbykkDMg125En0HVhjanae9JwCWbOH9BhaEcB9ILc/gAeEXedxvZjpdTkcuJRoYem0jzyBXIm1eCb7gSbGJ5ma9JVFysOxFFor3SiOAjTDotgqVtfG3SF0ecRnViO/dfW9sCzwpTABOg0FZTKV/0AzbPoLE9w8OGe3qZU/eyK+Uw4gP/ZmF9veP1Npnvhf3wS4xkyg0zIvhIeOWQyArbir7dr0xTPhoOv3+GrDwKfCVfEvLEAwcL4TZPx
 arthur@Arthur.local

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2018-04-10 Thread translation

commit b8e0ea83bd01b9089ea3c60f306a97177576e5e5
Author: Translation commit bot 
Date:   Tue Apr 10 08:47:03 2018 +

Update translations for tails-misc_completed
---
 uk.po | 148 +++---
 1 file changed, 97 insertions(+), 51 deletions(-)

diff --git a/uk.po b/uk.po
index d67466b44..a3ee3181c 100644
--- a/uk.po
+++ b/uk.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-13 20:10+0200\n"
-"PO-Revision-Date: 2018-02-19 20:49+\n"
+"POT-Creation-Date: 2018-03-12 19:03+0100\n"
+"PO-Revision-Date: 2018-04-10 08:33+\n"
 "Last-Translator: O Herenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -53,36 +53,40 @@ msgid ""
 "\n"
 msgstr " ÐÐ¾Ð¿Ð¾Ð¼Ð¾Ð¶ÑÑÑ Ð½Ð°Ð¼ Ð²Ð¸Ð¿ÑÐ°Ð²Ð¸ÑÐ¸ Ð½Ð°ÑÑ 
Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ! \n ÐÑÐ¾ÑÐ¸ÑÐ°Ð¹ÑÐµ  Ð½Ð°ÑÑ 
ÑÐ½ÑÑÑÑÐºÑÑÑ, ÑÐº Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÑÑÐ¸ Ð¿ÑÐ¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ 
.\n ÐÐµ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÑÐ¹ÑÐµ Ð±ÑÐ»ÑÑÐµ 
Ð¾ÑÐ¾Ð±Ð¸ÑÑÐ¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ, Ð½ÑÐ¶ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¾! 
\n ÐÑÐ¾ Ð½Ð°Ð´Ð°Ð½Ð½Ñ Ð½Ð°Ð¼ Ð°Ð´ÑÐµÑÐ¸ 
ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ñ Ð¿Ð¾ÑÑÐ¸ \n\nÐÐ°Ð´Ð°Ð½Ð½Ñ Ð½Ð°Ð¼ 
Ð°Ð´ÑÐµÑÐ¸ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ñ Ð¿Ð¾ÑÑÐ¸ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ Ð½Ð°Ð¼ 
Ð·Ð²'ÑÐ·Ð°ÑÐ¸ÑÑ Ð· ÐÐ°Ð¼Ð¸ Ð´Ð»Ñ ÑÑÐ¾ÑÐ½ÐµÐ½Ð½Ñ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸. 
Ð¦Ðµ\nÐ½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¾ Ð² Ð¿ÐµÑÐµÐ²Ð°Ð¶Ð½ÑÐ¹ Ð±ÑÐ»ÑÑÐ¾ÑÑÑ 
Ð²Ð¸Ð¿Ð°Ð´ÐºÑÐ², ÐºÐ¾Ð»Ð¸ Ð¼Ð¸ Ð¾ÑÑÐ¸Ð¼ÑÑÐ¼Ð¾ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ 
Ð¿ÑÐ¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸,\n Ð¾ÑÐºÑÐ»ÑÐºÐ¸ Ð±ÑÐ»ÑÑÑÑÑÑ 
Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ Ð±ÐµÐ· ÐºÐ¾Ð½ÑÐ°ÐºÑÐ½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ 
Ð¼Ð°ÑÐ½Ñ. Ð ÑÐ½ÑÐ¾Ð³Ð¾ Ð±Ð¾ÐºÑ, ÑÐµ ÑÐ°ÐºÐ¾Ð¶ Ð´Ð°Ñ 
Ð¼Ð¾Ð¶Ð»Ð¸Ð²ÑÑÑÑ Ð·Ð°ÑÐ¾Ð±Ð°Ð
 ¼ Ð¿ÐµÑÐµÑÐ¾Ð¿Ð»ÐµÐ½Ð½Ñ\n ÑÐ° Ð·Ð±Ð¾ÑÑ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ, 
Ð½Ð°Ð¿ÑÐ¸ÐºÐ»Ð°Ð´, Ð¿ÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑÑ ÐÐ°ÑÐ¾Ñ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ñ 
Ð¿Ð¾ÑÑÐ¸ Ð°Ð±Ð¾ ÐÐ½ÑÐµÑÐ½ÐµÑ-Ð¿ÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑÑ, 
Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸,\n ÑÐ¾ ÐÐ¸ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑÑÐµ Tails.\n\n"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:17
+#: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
 msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð¿Ð¾ÑÑÑÐ¹Ð½Ð¾Ð³Ð¾ ÑÑÐ¾Ð²Ð¸ÑÐ° Ð²ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð¸Ð¹ 
Ð´Ð»Ñ Electrum"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:19
+#: config/chroot_local-includes/usr/local/bin/electrum:59
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your "
 "Bitcoin wallet. It is strongly recommended to only run Electrum when its "
 "persistence feature is activated."
 msgstr "ÐÐ¾Ð»Ð¸ ÐÐ¸ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÑÐµ Tails, Ð²ÑÑ Ð´Ð°Ð½Ñ 
Electrum Ð±ÑÐ´ÑÑÑ Ð·Ð°Ð³ÑÐ±Ð»ÐµÐ½Ñ, Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸ ÐÐ°Ñ 
Ð³Ð°Ð¼Ð°Ð½ÐµÑÑ Bitcoin. ÐÐ°ÑÑÑÐ¹Ð½Ð¾ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÑÑÑÑÑ 
Ð·Ð°Ð¿ÑÑÐºÐ°ÑÐ¸ Electrum, ÑÑÐ»ÑÐºÐ¸ ÐºÐ¾Ð»Ð¸ Ð°ÐºÑÐ¸Ð²Ð¾Ð²Ð°Ð½Ð° 
ÑÑÐ½ÐºÑÑÑ Ð¿Ð¾ÑÑÑÐ¹Ð½Ð¾Ð³Ð¾ ÑÑÐ¾Ð²Ð¸ÑÐ°."
 
-#: config/chroot_local-includes/usr/local/bin/electrum:21
+#: config/chroot_local-includes/usr/local/bin/electrum:60
 msgid "Do you want to start Electrum anyway?"
 msgstr "Ð£ Ð±ÑÐ´Ñ-ÑÐºÐ¾Ð¼Ñ Ð²Ð¸Ð¿Ð°Ð´ÐºÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸ Electrum ?"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:23
+#: config/chroot_local-includes/usr/local/bin/electrum:63
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_ÐÐ°Ð¿ÑÑÐº"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:24
+#: config/chroot_local-includes/usr/local/bin/electrum:64
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_ÐÐ¸ÑÑÐ´"
 
-#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-hel...@tails.boum.org/extension.js:71
+#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
 msgstr "ÐÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸"
 
-#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-hel...@tails.boum.org/extension.js:74
+#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:78
+msgid "Lock screen"
+msgstr "ÐÐ°Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÐµÐºÑÐ°Ð½"
+
+#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:81
 msgid "Power Off"
 msgstr "ÐÐ¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð¶Ð¸Ð²Ð»ÐµÐ½Ð½Ñ"
 
@@ -111,24 +115,51 @@ msgstr "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð¿ÑÐ¾ Ð·Ð±Ð¾ÑÐºÑ:\n%s"
 msgid "not available"
 msgstr "Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:162
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:166
-msgid "Your additional software"
-msgstr "ÐÐ°ÑÐµ Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ðµ

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-04-10 Thread translation

commit 4ccd6c3e4d22af6ce91a1c026766d88a87ae7fee
Author: Translation commit bot 
Date:   Tue Apr 10 08:46:58 2018 +

Update translations for tails-misc
---
 uk.po | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/uk.po b/uk.po
index 904823f4b..a3ee3181c 100644
--- a/uk.po
+++ b/uk.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-03-13 02:48+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-04-10 08:33+\n"
+"Last-Translator: O Herenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,7 +84,7 @@ msgstr "ÐÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:78
 msgid "Lock screen"
-msgstr ""
+msgstr "ÐÐ°Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÐµÐºÑÐ°Ð½"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:81
 msgid "Power Off"
@@ -117,37 +117,37 @@ msgstr "Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:170
 msgid "Your additional software installation failed"
-msgstr ""
+msgstr "ÐÐ°ÑÐµ Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ðµ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ 
Ð²Ð´Ð°Ð»Ð¾ÑÑ"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:171
 msgid ""
 "The installation failed. Please check your additional software "
 "configuration, or read the system log to understand better the problem."
-msgstr ""
+msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ. ÐÐµÑÐµÐ²ÑÑÑÐµ 
Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ñ ÐºÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¾Ð³Ð¾ 
Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð½Ñ Ð°Ð±Ð¾ Ð¿ÑÐ¾ÑÐ¸ÑÐ°Ð¹ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ð½Ð¸Ð¹ 
Ð¶ÑÑÐ½Ð°Ð», ÑÐ¾Ð± ÐºÑÐ°ÑÐµ Ð·ÑÐ¾Ð·ÑÐ¼ÑÑÐ¸ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:177
 msgid "Your additional software are installed"
-msgstr ""
+msgstr "ÐÐ°ÑÐµ Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ðµ 
Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð½Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:178
 msgid "Your additional software are ready to use."
-msgstr ""
+msgstr "ÐÐ°ÑÐµ Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ðµ 
Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð½Ñ Ð³Ð¾ÑÐ¾Ð²Ðµ Ð´Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:194
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:204
 msgid "Your additional software upgrade failed"
-msgstr ""
+msgstr "ÐÐ°ÑÐµ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ 
Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð½Ñ Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:195
 msgid ""
 "The check for upgrades failed. This might be due to a network problem. "
 "Please check your network connection, try to restart Tails, or read the "
 "system log to understand better the problem."
-msgstr ""
+msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¿ÐµÑÐµÐ²ÑÑÐ¸ÑÐ¸ Ð½Ð°ÑÐ²Ð½ÑÑÑÑ 
Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ñ. Ð¦Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð¿Ð¾Ð²'ÑÐ·Ð°Ð½Ð¾ Ð· 
Ð¼ÐµÑÐµÐ¶ÐµÐ²Ð¾Ñ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¾Ñ. ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑÐµÐ²ÑÑÑÐµ 
Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½Ñ Ð´Ð¾ Ð¼ÐµÑÐµÐ¶Ñ, ÑÐ¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 
Ð¿ÐµÑÐµÐ·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸ Tails Ð°Ð±Ð¾ Ð¿ÑÐ¾ÑÐ¸ÑÐ°Ð¹ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ð½Ð¸Ð¹ 
Ð¶ÑÑÐ½Ð°Ð», ÑÐ¾Ð± ÐºÑÐ°ÑÐµ Ð·ÑÐ¾Ð·ÑÐ¼ÑÑÐ¸ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:201
 msgid "Your additional software are up to date"
-msgstr ""
+msgstr "ÐÐ°ÑÐµ Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ðµ 
Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð½Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:202
 msgid "The upgrade was successful."
@@ -207,7 +207,7 @@ msgstr "ÐÑÐ´Ð¼ÑÐ½Ð° MAC Ð½Ðµ Ð²Ð´Ð°Ð»Ð°ÑÑ Ð´Ð»Ñ 
Ð¼ÐµÑÐµÐ¶ÐµÐ²Ð¾Ñ ÐºÐ°Ñ
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
 msgid "Lock Screen"
-msgstr ""
+msgstr "ÐÐ°Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÐµÐºÑÐ°Ð½"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
@@ -216,11 +216,11 @@ msgstr "ÐÑÐ´Ð¼Ð¾Ð²Ð°"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
 msgid "Screen Locker"
-msgstr ""
+msgstr "ÐÐ»Ð¾ÐºÑÐ²Ð°Ð»ÑÐ½Ð¸Ðº ÐµÐºÑÐ°Ð½Ñ"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
 msgid "Set up a password to unlock the screen."
-msgstr ""
+msgstr "ÐÑÑÐ°Ð½Ð¾Ð²ÑÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ, ÑÐ¾Ð± ÑÐ¾Ð·Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ 
ÐµÐºÑÐ°Ð½."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
 msgid "Password"
@@ -241,7 +241,7 @@ msgid ""
 "\n"
 "Or do a manual upgrade.\n"
 "See

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2018-04-10 Thread translation

commit e95d537a0144233fd67d1be6410ab4618ee3d056
Author: Translation commit bot 
Date:   Tue Apr 10 08:45:47 2018 +

Update translations for https_everywhere_completed
---
 uk/https-everywhere.dtd | 4 
 1 file changed, 4 insertions(+)

diff --git a/uk/https-everywhere.dtd b/uk/https-everywhere.dtd
index 2157105ff..95844e5e0 100644
--- a/uk/https-everywhere.dtd
+++ b/uk/https-everywhere.dtd
@@ -2,6 +2,7 @@
 
 
 
+
 
 
 
@@ -12,8 +13,11 @@
 
 
 
+
 
 
+
+
 
 
 

___
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

2018-04-10 Thread translation

commit e93c2aff7436aec06919ece464e5007490e09b16
Author: Translation commit bot 
Date:   Tue Apr 10 08:45:38 2018 +

Update translations for https_everywhere
---
 uk/https-everywhere.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uk/https-everywhere.dtd b/uk/https-everywhere.dtd
index 509b6cbc2..95844e5e0 100644
--- a/uk/https-everywhere.dtd
+++ b/uk/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -16,8 +16,8 @@
 
 
 
-
-
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Fix typo in Rose Foundation sponsor

2018-04-10 Thread hiro

commit 36516b49f74106d09a3db6a2f911948ccea53f0e
Author: hiro 
Date:   Tue Apr 10 10:39:34 2018 +0200

Fix typo in Rose Foundation sponsor
---
 about/en/sponsors.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml
index 1f673c0c..168e8150 100644
--- a/about/en/sponsors.wml
+++ b/about/en/sponsors.wml
@@ -26,7 +26,7 @@
 Active Sponsors in 2018:
   
  Tens of thousands of personal 
donations from individuals like you (2006-present)
- https://rosefdn.org/;>Rose Foundation for Communities 
and the Environment (2017-2018)
+ https://rosefdn.org/;>Rose Foundation for Communities 
and the Environment (2017-2018)
  https://www.mozilla.org/en-US/moss/;>Mozilla 
(2016-2018)
  https://www.opentech.fund/;>Open Technology Fund 
(2012-2018)
  http://mediademocracyfund.org/;>Media Democracy Fund 
(2016-2018)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 1448771 - Merge fix from upstream. r=ryanvm, a=RyanVM

2018-04-10 Thread gk

commit c6167b77baf79a28bd55b4f09dba85422515c5bc
Author: Jonathan Kew 
Date:   Mon Mar 26 20:35:48 2018 +0100

Bug 1448771 - Merge fix from upstream. r=ryanvm, a=RyanVM

--HG--
extra : source : f5db47b5c6416a3cef546de1aa9089d98109f95f
---
 intl/hyphenation/hyphen/hyphen.c | 22 ++
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/intl/hyphenation/hyphen/hyphen.c b/intl/hyphenation/hyphen/hyphen.c
index 9a132d0262f2..9f2b7112c848 100644
--- a/intl/hyphenation/hyphen/hyphen.c
+++ b/intl/hyphenation/hyphen/hyphen.c
@@ -438,11 +438,25 @@ for (k = 0; k < 2; k++) {
   }
 
   if (k == 0 || nextlevel) {
-while (fgets (buf, sizeof(buf), f) != NULL) {
+while (fgets(buf, sizeof(buf), f) != NULL) {
+  
+  /* discard lines that don't fit in buffer */
+  if (!feof(f) && strchr(buf, '\n') == NULL) {
+int c;
+while ((c = fgetc(f)) != '\n' && c != EOF);
+/* issue warning if not a comment */
+if (buf[0] != '%') {
+  fprintf(stderr, "Warning: skipping too long pattern (more than %lu 
chars)\n", sizeof(buf));
+}
+continue;
+  }
+  
   if (strncmp(buf, "NEXTLEVEL", 9) == 0) {
-   nextlevel = 1;
-   break;
-  } else if (buf[0] != '%') hnj_hyphen_load_line(buf, dict[k], hashtab);
+nextlevel = 1;
+break;
+  } else if (buf[0] != '%') {
+hnj_hyphen_load_line(buf, dict[k], hashtab);
+  }
 }
   } else if (k == 1) {
 /* default first level: hyphen and ASCII apostrophe */

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 1448771 - Update hnjstdio to handle additional functions from stdio.h that libhyphen wants to use. r=glandium, a=RyanVM

2018-04-10 Thread gk

commit 0e1e49d4971bb891152c93b8b62665f24bd8a0c2
Author: Jonathan Kew 
Date:   Wed Mar 28 10:17:51 2018 +0100

Bug 1448771 - Update hnjstdio to handle additional functions from stdio.h 
that libhyphen wants to use. r=glandium, a=RyanVM

--HG--
extra : source : 846bcaa210aa2264bec412c0595113964fafc972
---
 intl/hyphenation/glue/hnjalloc.h   |  6 +
 intl/hyphenation/glue/hnjstdio.cpp | 50 ++
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/intl/hyphenation/glue/hnjalloc.h b/intl/hyphenation/glue/hnjalloc.h
index fec3a4bc9009..5cee1be1b6d7 100644
--- a/intl/hyphenation/glue/hnjalloc.h
+++ b/intl/hyphenation/glue/hnjalloc.h
@@ -31,6 +31,8 @@
 #define fopen(path,mode)  hnjFopen(path,mode)
 #define fclose(file)  hnjFclose(file)
 #define fgets(buf,count,file) hnjFgets(buf,count,file)
+#define feof(file)hnjFeof(file)
+#define fgetc(file)   hnjFgetc(file)
 
 typedef struct hnjFile_ hnjFile;
 
@@ -44,6 +46,10 @@ int hnjFclose(hnjFile* f);
 
 char* hnjFgets(char* s, int n, hnjFile* f);
 
+int hnjFeof(hnjFile* f);
+
+int hnjFgetc(hnjFile* f);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/intl/hyphenation/glue/hnjstdio.cpp 
b/intl/hyphenation/glue/hnjstdio.cpp
index 660ebaf13291..8d50ae17f57b 100644
--- a/intl/hyphenation/glue/hnjstdio.cpp
+++ b/intl/hyphenation/glue/hnjstdio.cpp
@@ -22,6 +22,7 @@ struct hnjFile_ {
 char mBuffer[BUFSIZE];
 uint32_t mCurPos;
 uint32_t mLimit;
+bool mEOF;
 };
 
 // replacement for fopen()
@@ -58,6 +59,7 @@ hnjFopen(const char* aURISpec, const char* aMode)
 f->mStream = instream;
 f->mCurPos = 0;
 f->mLimit = 0;
+f->mEOF = false;
 
 return f;
 }
@@ -79,6 +81,27 @@ hnjFclose(hnjFile* f)
 return result;
 }
 
+// replacement for fgetc()
+int
+hnjFgetc(hnjFile* f)
+{
+if (f->mCurPos >= f->mLimit) {
+f->mCurPos = 0;
+
+nsresult rv = f->mStream->Read(f->mBuffer, BUFSIZE, >mLimit);
+if (NS_FAILED(rv)) {
+f->mLimit = 0;
+}
+
+if (f->mLimit == 0) {
+f->mEOF = true;
+return EOF;
+}
+}
+
+return f->mBuffer[f->mCurPos++];
+}
+
 // replacement for fgets()
 // (not a full reimplementation, but sufficient for libhyphen's needs)
 char*
@@ -88,24 +111,15 @@ hnjFgets(char* s, int n, hnjFile* f)
 
 int i = 0;
 while (i < n - 1) {
-if (f->mCurPos < f->mLimit) {
-char c = f->mBuffer[f->mCurPos++];
-s[i++] = c;
-if (c == '\n' || c == '\r') {
-break;
-}
-continue;
-}
-
-f->mCurPos = 0;
+int c = hnjFgetc(f);
 
-nsresult rv = f->mStream->Read(f->mBuffer, BUFSIZE, >mLimit);
-if (NS_FAILED(rv)) {
-f->mLimit = 0;
-return nullptr;
+if (c == EOF) {
+break;
 }
 
-if (f->mLimit == 0) {
+s[i++] = c;
+
+if (c == '\n' || c == '\r') {
 break;
 }
 }
@@ -117,3 +131,9 @@ hnjFgets(char* s, int n, hnjFile* f)
 s[i] = '\0'; // null-terminate the returned string
 return s;
 }
+
+int
+hnjFeof(hnjFile* f)
+{
+return f->mEOF ? EOF : 0;
+}



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

69 matches

Mail list logo