date:20200630

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-06-30 Thread translation

commit 5251859097e8a9916b907843701a32c8b8556aff
Author: Translation commit bot 
Date:   Tue Jun 30 09:45:45 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 he.po | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/he.po b/he.po
index 1f318dc846..61e7206b85 100644
--- a/he.po
+++ b/he.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-06-29 00:35+\n"
+"PO-Revision-Date: 2020-06-30 09:41+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -409,7 +409,7 @@ msgstr "×× ××§×××"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
 msgid "_Unsafe Browser"
-msgstr ""
+msgstr "_××¤××¤× ×××ª× ××××"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
 msgid "Enabled"
@@ -417,7 +417,7 @@ msgstr "××××¤×©×¨"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
 msgid "Disabled (default)"
-msgstr ""
+msgstr "×××©××ª (××¨××¨×ª ××××)"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
@@ -662,11 +662,11 @@ msgstr "×©×××¨ ×§××¦×× ×××××¡× ×× 
××¡××¤×¨×××ª `Persistent'"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
 msgid "Settings on the Welcome Screen"
-msgstr ""
+msgstr "××××¨××ª ×××¡× ××¨×× ×××"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
 msgid "Language, administration password, and additional settings"
-msgstr ""
+msgstr "×©×¤×, ×¡××¡××ª ××× ××, ×××××¨××ª × ××¡×¤××ª"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Browser Bookmarks"
@@ -1445,7 +1445,7 @@ msgid ""
 "The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
 "to use the Unsafe Browser, you have to restart Tails and enable it in the "
 "settings on the Welcome Screen."
-msgstr ""
+msgstr "×××¤××¤× ××××ª× ×××× ×× ×××¤×©×¨ ×××¡× ××¨×× 
×××.\\n\\n×× ××ª× ×¨××¦× ×××©×ª××© ×××¤××¤× ××××ª× 
××××, ××ª× ×××× ×××¤×¢×× ××××© ××ª Tails ××××¤×©×¨ 
×××ª× ×××××¨××ª ×××¡× ××¨×× ×××."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
@@ -1639,15 +1639,15 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
 msgid "Disable the Unsafe Browser (default)"
-msgstr ""
+msgstr "××©××ª ××ª ×××¤××¤× ××××ª× ×××× (××¨××¨×ª ××××)"
 
 #: 
../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
 msgid "Enable the Unsafe Browser"
-msgstr ""
+msgstr "××¤×©×¨ ××ª ×××¤××¤× ××××ª× ××××"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
 msgid "Settings were loaded from the persistent storage."
-msgstr ""
+msgstr "××××¨××ª × ××¢× × ×××××¡×× ×××ª×××."
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""

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

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2020-06-30 Thread translation

commit 468a9aaaf1804fccb692dcfb9b1a4a93d8442bf3
Author: Translation commit bot 
Date:   Tue Jun 30 09:46:27 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 he.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he.po b/he.po
index 2438855468..9bbe51f1db 100644
--- a/he.po
+++ b/he.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-06-29 00:35+\n"
+"PO-Revision-Date: 2020-06-30 09:41+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-06-30 Thread translation

commit ac1a91e4aead7623dcfb8426ba4d826121e9b77d
Author: Translation commit bot 
Date:   Tue Jun 30 10:15:49 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 he.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/he.po b/he.po
index 61e7206b85..bb34137b16 100644
--- a/he.po
+++ b/he.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-06-30 09:41+\n"
+"PO-Revision-Date: 2020-06-30 09:47+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -1635,7 +1635,7 @@ msgid ""
 "A captive portal is a web page that is displayed before you can access the 
Internet. Captive portals usually require to log in to the network or enter 
information such as an email address.\n"
 "\n"
 "The Unsafe Browser is not anonymous and can deanonymize you. Use it only to 
log in to captive portals."
-msgstr ""
+msgstr "×××¤××¤× ××××ª× ×××× ××ª××¨ ×× ××××× ×¡ ×× 
×¤××¨×× ×©×××.\n\n×¤××¨×× ×©××× ××× ××£ ×¨×©×ª ××©×¨ ×××¦× 
××¤× × ×©××ª× ×××× ×××©×× ×××©× ×× ×××× ××¨× ×. 
×¤××¨×××× ×©××××× ×××¨×©×× ×××¨× ××× ××××× ×¡ ×× 
××¨×©×ª ×× ×××× ××¡ ××××¢ ×××× ××ª×××ª 
××××´×.\n\n×××¤××¤× ××××ª× ×××× ××× × ××××× × 
××××× ×××©××£ ××ª ××××ª×. ××©×ª××© ×× ×¨×§ ××× ××××× ×¡ 
×× ×¤××¨×××× ×©×××××."
 
 #: 
../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
 msgid "Disable the Unsafe Browser (default)"

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

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2020-06-30 Thread translation

commit 7b432db6cdd3d8643db9fe6675af529c8380fdd9
Author: Translation commit bot 
Date:   Tue Jun 30 10:16:52 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 he.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he.po b/he.po
index 9bbe51f1db..5b78482b65 100644
--- a/he.po
+++ b/he.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-06-30 09:41+\n"
+"PO-Revision-Date: 2020-06-30 09:47+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-06-30 Thread translation

commit d2628331c1552e1fffc7e29f2e4dac313c8ee5a9
Author: Translation commit bot 
Date:   Tue Jun 30 11:45:48 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 es.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es.po b/es.po
index 1ff373f25c..5f6084b70d 100644
--- a/es.po
+++ b/es.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-06-29 00:35+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2020-06-30 11:45+\n"
+"Last-Translator: eulalio barbero espinosa \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -665,7 +665,7 @@ msgstr "Mantener archivos almacenados en la capeta 
'Persistent'"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
 msgid "Settings on the Welcome Screen"
-msgstr ""
+msgstr "Ajustes en la pantalla de bienvenida"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
 msgid "Language, administration password, and additional settings"

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

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2020-06-30 Thread translation

commit 2cd0489d91c976eb0321805642b321beb3b924ef
Author: Translation commit bot 
Date:   Tue Jun 30 11:46:28 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es.po b/es.po
index 74e1d3dc5d..54204240dc 100644
--- a/es.po
+++ b/es.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-06-29 00:35+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2020-06-30 11:46+\n"
+"Last-Translator: eulalio barbero espinosa \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\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] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-06-30 Thread translation

commit 20e0a999e89859d8511604bf27f626502002cbe9
Author: Translation commit bot 
Date:   Tue Jun 30 12:15:56 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es.po b/es.po
index 5f6084b70d..bfa76d162d 100644
--- a/es.po
+++ b/es.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-06-30 11:45+\n"
+"PO-Revision-Date: 2020-06-30 11:46+\n"
 "Last-Translator: eulalio barbero espinosa \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -669,7 +669,7 @@ msgstr "Ajustes en la pantalla de bienvenida"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
 msgid "Language, administration password, and additional settings"
-msgstr ""
+msgstr "Idioma, contraseÃ±a de administraciÃ³n y configuraciÃ³n adicional"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Browser Bookmarks"

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

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-30 Thread ahf

commit c57896a76e2e858a74c8ea9c9c037761b0b40e5b
Merge: eef77227e b0bfee8c7
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.4'

2020-06-30 Thread ahf

commit 9e4b47233b8b5c7407ffdcd91f60eaad621c6a2a
Merge: 96876d3ad 21cf91ee2
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.4'

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

[tor-commits] [tor/master] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

2020-06-30 Thread ahf

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742
Merge: 0c0214bcc 4f6901d7c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:35:13 2020 +

Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit b0bfee8c783b495ece772189d478dad2628bc159
Merge: d235e523d bebdd2888
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-30 Thread ahf

commit 21cf91ee2c3bb664253cc096c1aaa45fd491594e
Merge: feddba6f8 c57896a76
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4




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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-30 Thread ahf

commit 21cf91ee2c3bb664253cc096c1aaa45fd491594e
Merge: feddba6f8 c57896a76
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4

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

[tor-commits] [tor/release-0.3.5] When initializing pthreads, always set the main thread.

2020-06-30 Thread ahf

commit 4f6901d7cc827e5bfa98467b7a568f725ce7fa9f
Author: Nick Mathewson 
Date:   Mon Jan 6 09:37:12 2020 -0500

When initializing pthreads, always set the main thread.

Fixes bug 32884.  This is a bugfix on 0.3.3.1-alpha, when we started
allowing restart-in-process with tor_api.h.
---
 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug32884 b/changes/bug32884
new file mode 100644
index 0..9ab1d2446
--- /dev/null
+++ b/changes/bug32884
@@ -0,0 +1,5 @@
+  o Minor bugfixes (embedded Tor):
+- When starting Tor any time after the first time in a process, register
+  the thread in which it is running as the main thread.  Previously, we
+  only did this on Windows, which could lead to bugs like 23081 on
+  non-Windows platforms.  Fixes bug 32884; bugfix on 0.3.3.1-alpha.
diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c
index 05efe9cfd..6f7ecd17d 100644
--- a/src/lib/thread/compat_pthreads.c
+++ b/src/lib/thread/compat_pthreads.c
@@ -265,6 +265,6 @@ tor_threads_init(void)
   pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED);
 tor_assert(ret2 == 0);
 threads_initialized = 1;
-set_main_thread();
   }
+  set_main_thread();
 }



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

[tor-commits] [tor/maint-0.4.4] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

2020-06-30 Thread ahf

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742
Merge: 0c0214bcc 4f6901d7c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:35:13 2020 +

Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.3.5] When initializing pthreads, always set the main thread.

2020-06-30 Thread ahf

commit 4f6901d7cc827e5bfa98467b7a568f725ce7fa9f
Author: Nick Mathewson 
Date:   Mon Jan 6 09:37:12 2020 -0500

When initializing pthreads, always set the main thread.

Fixes bug 32884.  This is a bugfix on 0.3.3.1-alpha, when we started
allowing restart-in-process with tor_api.h.
---
 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug32884 b/changes/bug32884
new file mode 100644
index 0..9ab1d2446
--- /dev/null
+++ b/changes/bug32884
@@ -0,0 +1,5 @@
+  o Minor bugfixes (embedded Tor):
+- When starting Tor any time after the first time in a process, register
+  the thread in which it is running as the main thread.  Previously, we
+  only did this on Windows, which could lead to bugs like 23081 on
+  non-Windows platforms.  Fixes bug 32884; bugfix on 0.3.3.1-alpha.
diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c
index 05efe9cfd..6f7ecd17d 100644
--- a/src/lib/thread/compat_pthreads.c
+++ b/src/lib/thread/compat_pthreads.c
@@ -265,6 +265,6 @@ tor_threads_init(void)
   pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED);
 tor_assert(ret2 == 0);
 threads_initialized = 1;
-set_main_thread();
   }
+  set_main_thread();
 }



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

[tor-commits] [tor/maint-0.4.2] When initializing pthreads, always set the main thread.

2020-06-30 Thread ahf

commit 4f6901d7cc827e5bfa98467b7a568f725ce7fa9f
Author: Nick Mathewson 
Date:   Mon Jan 6 09:37:12 2020 -0500

When initializing pthreads, always set the main thread.

Fixes bug 32884.  This is a bugfix on 0.3.3.1-alpha, when we started
allowing restart-in-process with tor_api.h.
---
 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug32884 b/changes/bug32884
new file mode 100644
index 0..9ab1d2446
--- /dev/null
+++ b/changes/bug32884
@@ -0,0 +1,5 @@
+  o Minor bugfixes (embedded Tor):
+- When starting Tor any time after the first time in a process, register
+  the thread in which it is running as the main thread.  Previously, we
+  only did this on Windows, which could lead to bugs like 23081 on
+  non-Windows platforms.  Fixes bug 32884; bugfix on 0.3.3.1-alpha.
diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c
index 05efe9cfd..6f7ecd17d 100644
--- a/src/lib/thread/compat_pthreads.c
+++ b/src/lib/thread/compat_pthreads.c
@@ -265,6 +265,6 @@ tor_threads_init(void)
   pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED);
 tor_assert(ret2 == 0);
 threads_initialized = 1;
-set_main_thread();
   }
+  set_main_thread();
 }



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

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit b0bfee8c783b495ece772189d478dad2628bc159
Merge: d235e523d bebdd2888
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit b0bfee8c783b495ece772189d478dad2628bc159
Merge: d235e523d bebdd2888
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-30 Thread ahf

commit c57896a76e2e858a74c8ea9c9c037761b0b40e5b
Merge: eef77227e b0bfee8c7
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3




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

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

2020-06-30 Thread ahf

commit 91d792388d7ad2dd67b8bf9e346a6c1a1d92a720
Merge: b31086201 bebdd2888
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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

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

2020-06-30 Thread ahf

commit c10323faae87f8e928566edc10a7be62fe7bb51b
Merge: ec2bc07f4 b0bfee8c7
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.2' into release-0.4.2

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-30 Thread ahf

commit c57896a76e2e858a74c8ea9c9c037761b0b40e5b
Merge: eef77227e b0bfee8c7
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3




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

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

2020-06-30 Thread ahf

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742
Merge: 0c0214bcc 4f6901d7c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:35:13 2020 +

Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit b0bfee8c783b495ece772189d478dad2628bc159
Merge: d235e523d bebdd2888
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

2020-06-30 Thread ahf

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742
Merge: 0c0214bcc 4f6901d7c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:35:13 2020 +

Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

2020-06-30 Thread ahf

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742
Merge: 0c0214bcc 4f6901d7c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:35:13 2020 +

Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.3] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

2020-06-30 Thread ahf

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742
Merge: 0c0214bcc 4f6901d7c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:35:13 2020 +

Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

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

2020-06-30 Thread ahf

commit b0bfee8c783b495ece772189d478dad2628bc159
Merge: d235e523d bebdd2888
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

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

2020-06-30 Thread ahf

commit b7f5113f72e5bdd075a7f5713094874544ac8510
Merge: fc4e1697f c57896a76
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.3' into release-0.4.3

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

[tor-commits] [tor/release-0.4.3] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

2020-06-30 Thread ahf

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742
Merge: 0c0214bcc 4f6901d7c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:35:13 2020 +

Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

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

2020-06-30 Thread ahf

commit 90f38a3c26290ce945eab7ca1ed6ade2046db282
Merge: 76e04a832 21cf91ee2
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.4' into release-0.4.4

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

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

2020-06-30 Thread ahf

commit 21cf91ee2c3bb664253cc096c1aaa45fd491594e
Merge: feddba6f8 c57896a76
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4




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

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-30 Thread ahf

commit c57896a76e2e858a74c8ea9c9c037761b0b40e5b
Merge: eef77227e b0bfee8c7
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3




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

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

2020-06-30 Thread ahf

commit c57896a76e2e858a74c8ea9c9c037761b0b40e5b
Merge: eef77227e b0bfee8c7
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3




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

[tor-commits] [tor/release-0.4.2] When initializing pthreads, always set the main thread.

2020-06-30 Thread ahf

commit 4f6901d7cc827e5bfa98467b7a568f725ce7fa9f
Author: Nick Mathewson 
Date:   Mon Jan 6 09:37:12 2020 -0500

When initializing pthreads, always set the main thread.

Fixes bug 32884.  This is a bugfix on 0.3.3.1-alpha, when we started
allowing restart-in-process with tor_api.h.
---
 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug32884 b/changes/bug32884
new file mode 100644
index 0..9ab1d2446
--- /dev/null
+++ b/changes/bug32884
@@ -0,0 +1,5 @@
+  o Minor bugfixes (embedded Tor):
+- When starting Tor any time after the first time in a process, register
+  the thread in which it is running as the main thread.  Previously, we
+  only did this on Windows, which could lead to bugs like 23081 on
+  non-Windows platforms.  Fixes bug 32884; bugfix on 0.3.3.1-alpha.
diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c
index 05efe9cfd..6f7ecd17d 100644
--- a/src/lib/thread/compat_pthreads.c
+++ b/src/lib/thread/compat_pthreads.c
@@ -265,6 +265,6 @@ tor_threads_init(void)
   pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED);
 tor_assert(ret2 == 0);
 threads_initialized = 1;
-set_main_thread();
   }
+  set_main_thread();
 }



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

[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

2020-06-30 Thread ahf

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742
Merge: 0c0214bcc 4f6901d7c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:35:13 2020 +

Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.4] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

2020-06-30 Thread ahf

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742
Merge: 0c0214bcc 4f6901d7c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:35:13 2020 +

Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit b0bfee8c783b495ece772189d478dad2628bc159
Merge: d235e523d bebdd2888
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit b0bfee8c783b495ece772189d478dad2628bc159
Merge: d235e523d bebdd2888
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:37:20 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug32884 | 5 +
 src/lib/thread/compat_pthreads.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.3] Merge branch 'tor-github/pr/1785' into maint-0.3.5

2020-06-30 Thread ahf

commit c3ad2a1d2367d6c0ba5c1c81491770056e881a77
Merge: bebdd2888 5721ec22d
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:47:55 2020 +

Merge branch 'tor-github/pr/1785' into maint-0.3.5

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.4] Merge branch 'tor-github/pr/1785' into maint-0.3.5

2020-06-30 Thread ahf

commit c3ad2a1d2367d6c0ba5c1c81491770056e881a77
Merge: bebdd2888 5721ec22d
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:47:55 2020 +

Merge branch 'tor-github/pr/1785' into maint-0.3.5

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.3.5] pem_decode(): Tolerate CRLF line endings

2020-06-30 Thread ahf

commit 5721ec22d8be99a6f24fa69d51d0cbdc4ff21739
Author: Nick Mathewson 
Date:   Wed Mar 11 09:40:04 2020 -0400

pem_decode(): Tolerate CRLF line endings

Fixes bug 33032; bugfix on 0.3.5.1-alpha when we introduced our own
PEM decoder.
---
 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/changes/bug33032 b/changes/bug33032
new file mode 100644
index 0..0c665f25d
--- /dev/null
+++ b/changes/bug33032
@@ -0,0 +1,6 @@
+  o Minor bugfixes (key portability):
+- When reading PEM-encoded key data, tolerate CRLF line-endings even if
+  we are not running on Windows. Previously, non-Windows hosts
+  would reject these line-endings in certain positions, making
+  certain key files hard to move from one host to another.
+  Fixes bug 33032; bugfix on 0.3.5.1-alpha.
diff --git a/src/lib/encoding/pem.c b/src/lib/encoding/pem.c
index 24b238b13..51f37d084 100644
--- a/src/lib/encoding/pem.c
+++ b/src/lib/encoding/pem.c
@@ -85,13 +85,19 @@ pem_decode(uint8_t *dest, size_t destlen, const char *src, 
size_t srclen,
   src = eat_whitespace_eos(src, eos);
 
   char *tag = NULL;
-  tor_asprintf(&tag, "-BEGIN %s-\n", objtype);
+  tor_asprintf(&tag, "-BEGIN %s-", objtype);
   if ((size_t)(eos-src) < strlen(tag) || fast_memneq(src, tag, strlen(tag))) {
 tor_free(tag);
 return -1;
   }
   src += strlen(tag);
   tor_free(tag);
+  /* At this point we insist on spaces (including CR), then an LF. */
+  src = eat_whitespace_eos_no_nl(src, eos);
+  if (src == eos || *src != '\n') {
+/* Extra junk at end of line: this isn't valid. */
+return -1;
+  }
 
   // NOTE lack of trailing \n.  We do not enforce its presence.
   tor_asprintf(&tag, "\n-END %s-", objtype);
diff --git a/src/test/test_pem.c b/src/test/test_pem.c
index 865688b1a..9eb99181e 100644
--- a/src/test/test_pem.c
+++ b/src/test/test_pem.c
@@ -115,8 +115,38 @@ test_crypto_pem_decode(void *arg)
   ;
 }
 
+static void
+test_crypto_pem_decode_crlf(void *arg)
+{
+  (void)arg;
+  char crlf_version[4096];
+  uint8_t buf[4096];
+
+  /* Convert 'expected' to a version with CRLF instead of LF. */
+  const char *inp = expected;
+  char *outp = crlf_version;
+  while (*inp) {
+if (*inp == '\n') {
+  *outp++ = '\r';
+}
+*outp++ = *inp++;
+  }
+  *outp = 0;
+
+  /* Decoding should succeed (or else we have bug 33032 again) */
+  int n = pem_decode(buf, sizeof(buf),
+ crlf_version, strlen(crlf_version),
+ "WOMBAT QUOTE");
+  tt_int_op(n, OP_EQ, strlen(example_pre));
+  tt_mem_op(buf, OP_EQ, example_pre, n);
+
+ done:
+  ;
+}
+
 struct testcase_t pem_tests[] = {
   { "encode", test_crypto_pem_encode, 0, NULL, NULL },
   { "decode", test_crypto_pem_decode, 0, NULL, NULL },
+  { "decode_crlf", test_crypto_pem_decode_crlf, 0, NULL, NULL },
   END_OF_TESTCASES
 };



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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit 483082b57bfb2535477530fe84d8c92c70be2fa1
Merge: b0bfee8c7 c3ad2a1d2
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit 483082b57bfb2535477530fe84d8c92c70be2fa1
Merge: b0bfee8c7 c3ad2a1d2
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-30 Thread ahf

commit 2042ebe88ee49259ec0665032a9bfa39ba6eb9cb
Merge: c57896a76 483082b57
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-30 Thread ahf

commit aced9be2243e823be3b3d771ae2dc59514fb5eba
Merge: 21cf91ee2 2042ebe88
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-30 Thread ahf

commit 2042ebe88ee49259ec0665032a9bfa39ba6eb9cb
Merge: c57896a76 483082b57
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3




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

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit 483082b57bfb2535477530fe84d8c92c70be2fa1
Merge: b0bfee8c7 c3ad2a1d2
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.2] pem_decode(): Tolerate CRLF line endings

2020-06-30 Thread ahf

commit 5721ec22d8be99a6f24fa69d51d0cbdc4ff21739
Author: Nick Mathewson 
Date:   Wed Mar 11 09:40:04 2020 -0400

pem_decode(): Tolerate CRLF line endings

Fixes bug 33032; bugfix on 0.3.5.1-alpha when we introduced our own
PEM decoder.
---
 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/changes/bug33032 b/changes/bug33032
new file mode 100644
index 0..0c665f25d
--- /dev/null
+++ b/changes/bug33032
@@ -0,0 +1,6 @@
+  o Minor bugfixes (key portability):
+- When reading PEM-encoded key data, tolerate CRLF line-endings even if
+  we are not running on Windows. Previously, non-Windows hosts
+  would reject these line-endings in certain positions, making
+  certain key files hard to move from one host to another.
+  Fixes bug 33032; bugfix on 0.3.5.1-alpha.
diff --git a/src/lib/encoding/pem.c b/src/lib/encoding/pem.c
index 24b238b13..51f37d084 100644
--- a/src/lib/encoding/pem.c
+++ b/src/lib/encoding/pem.c
@@ -85,13 +85,19 @@ pem_decode(uint8_t *dest, size_t destlen, const char *src, 
size_t srclen,
   src = eat_whitespace_eos(src, eos);
 
   char *tag = NULL;
-  tor_asprintf(&tag, "-BEGIN %s-\n", objtype);
+  tor_asprintf(&tag, "-BEGIN %s-", objtype);
   if ((size_t)(eos-src) < strlen(tag) || fast_memneq(src, tag, strlen(tag))) {
 tor_free(tag);
 return -1;
   }
   src += strlen(tag);
   tor_free(tag);
+  /* At this point we insist on spaces (including CR), then an LF. */
+  src = eat_whitespace_eos_no_nl(src, eos);
+  if (src == eos || *src != '\n') {
+/* Extra junk at end of line: this isn't valid. */
+return -1;
+  }
 
   // NOTE lack of trailing \n.  We do not enforce its presence.
   tor_asprintf(&tag, "\n-END %s-", objtype);
diff --git a/src/test/test_pem.c b/src/test/test_pem.c
index 865688b1a..9eb99181e 100644
--- a/src/test/test_pem.c
+++ b/src/test/test_pem.c
@@ -115,8 +115,38 @@ test_crypto_pem_decode(void *arg)
   ;
 }
 
+static void
+test_crypto_pem_decode_crlf(void *arg)
+{
+  (void)arg;
+  char crlf_version[4096];
+  uint8_t buf[4096];
+
+  /* Convert 'expected' to a version with CRLF instead of LF. */
+  const char *inp = expected;
+  char *outp = crlf_version;
+  while (*inp) {
+if (*inp == '\n') {
+  *outp++ = '\r';
+}
+*outp++ = *inp++;
+  }
+  *outp = 0;
+
+  /* Decoding should succeed (or else we have bug 33032 again) */
+  int n = pem_decode(buf, sizeof(buf),
+ crlf_version, strlen(crlf_version),
+ "WOMBAT QUOTE");
+  tt_int_op(n, OP_EQ, strlen(example_pre));
+  tt_mem_op(buf, OP_EQ, example_pre, n);
+
+ done:
+  ;
+}
+
 struct testcase_t pem_tests[] = {
   { "encode", test_crypto_pem_encode, 0, NULL, NULL },
   { "decode", test_crypto_pem_decode, 0, NULL, NULL },
+  { "decode_crlf", test_crypto_pem_decode_crlf, 0, NULL, NULL },
   END_OF_TESTCASES
 };



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

[tor-commits] [tor/maint-0.4.2] Merge branch 'tor-github/pr/1785' into maint-0.3.5

2020-06-30 Thread ahf

commit c3ad2a1d2367d6c0ba5c1c81491770056e881a77
Merge: bebdd2888 5721ec22d
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:47:55 2020 +

Merge branch 'tor-github/pr/1785' into maint-0.3.5

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.3.5] Merge branch 'tor-github/pr/1785' into maint-0.3.5

2020-06-30 Thread ahf

commit c3ad2a1d2367d6c0ba5c1c81491770056e881a77
Merge: bebdd2888 5721ec22d
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:47:55 2020 +

Merge branch 'tor-github/pr/1785' into maint-0.3.5

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-30 Thread ahf

commit 2042ebe88ee49259ec0665032a9bfa39ba6eb9cb
Merge: c57896a76 483082b57
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3




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

[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit 483082b57bfb2535477530fe84d8c92c70be2fa1
Merge: b0bfee8c7 c3ad2a1d2
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

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

2020-06-30 Thread ahf

commit 2eb9af0296a51059804cc6c9df62d86703cabb9a
Merge: 91d792388 c3ad2a1d2
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1785' into maint-0.3.5

2020-06-30 Thread ahf

commit c3ad2a1d2367d6c0ba5c1c81491770056e881a77
Merge: bebdd2888 5721ec22d
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:47:55 2020 +

Merge branch 'tor-github/pr/1785' into maint-0.3.5

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.2] pem_decode(): Tolerate CRLF line endings

2020-06-30 Thread ahf

commit 5721ec22d8be99a6f24fa69d51d0cbdc4ff21739
Author: Nick Mathewson 
Date:   Wed Mar 11 09:40:04 2020 -0400

pem_decode(): Tolerate CRLF line endings

Fixes bug 33032; bugfix on 0.3.5.1-alpha when we introduced our own
PEM decoder.
---
 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/changes/bug33032 b/changes/bug33032
new file mode 100644
index 0..0c665f25d
--- /dev/null
+++ b/changes/bug33032
@@ -0,0 +1,6 @@
+  o Minor bugfixes (key portability):
+- When reading PEM-encoded key data, tolerate CRLF line-endings even if
+  we are not running on Windows. Previously, non-Windows hosts
+  would reject these line-endings in certain positions, making
+  certain key files hard to move from one host to another.
+  Fixes bug 33032; bugfix on 0.3.5.1-alpha.
diff --git a/src/lib/encoding/pem.c b/src/lib/encoding/pem.c
index 24b238b13..51f37d084 100644
--- a/src/lib/encoding/pem.c
+++ b/src/lib/encoding/pem.c
@@ -85,13 +85,19 @@ pem_decode(uint8_t *dest, size_t destlen, const char *src, 
size_t srclen,
   src = eat_whitespace_eos(src, eos);
 
   char *tag = NULL;
-  tor_asprintf(&tag, "-BEGIN %s-\n", objtype);
+  tor_asprintf(&tag, "-BEGIN %s-", objtype);
   if ((size_t)(eos-src) < strlen(tag) || fast_memneq(src, tag, strlen(tag))) {
 tor_free(tag);
 return -1;
   }
   src += strlen(tag);
   tor_free(tag);
+  /* At this point we insist on spaces (including CR), then an LF. */
+  src = eat_whitespace_eos_no_nl(src, eos);
+  if (src == eos || *src != '\n') {
+/* Extra junk at end of line: this isn't valid. */
+return -1;
+  }
 
   // NOTE lack of trailing \n.  We do not enforce its presence.
   tor_asprintf(&tag, "\n-END %s-", objtype);
diff --git a/src/test/test_pem.c b/src/test/test_pem.c
index 865688b1a..9eb99181e 100644
--- a/src/test/test_pem.c
+++ b/src/test/test_pem.c
@@ -115,8 +115,38 @@ test_crypto_pem_decode(void *arg)
   ;
 }
 
+static void
+test_crypto_pem_decode_crlf(void *arg)
+{
+  (void)arg;
+  char crlf_version[4096];
+  uint8_t buf[4096];
+
+  /* Convert 'expected' to a version with CRLF instead of LF. */
+  const char *inp = expected;
+  char *outp = crlf_version;
+  while (*inp) {
+if (*inp == '\n') {
+  *outp++ = '\r';
+}
+*outp++ = *inp++;
+  }
+  *outp = 0;
+
+  /* Decoding should succeed (or else we have bug 33032 again) */
+  int n = pem_decode(buf, sizeof(buf),
+ crlf_version, strlen(crlf_version),
+ "WOMBAT QUOTE");
+  tt_int_op(n, OP_EQ, strlen(example_pre));
+  tt_mem_op(buf, OP_EQ, example_pre, n);
+
+ done:
+  ;
+}
+
 struct testcase_t pem_tests[] = {
   { "encode", test_crypto_pem_encode, 0, NULL, NULL },
   { "decode", test_crypto_pem_decode, 0, NULL, NULL },
+  { "decode_crlf", test_crypto_pem_decode_crlf, 0, NULL, NULL },
   END_OF_TESTCASES
 };



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-30 Thread ahf

commit aced9be2243e823be3b3d771ae2dc59514fb5eba
Merge: 21cf91ee2 2042ebe88
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4




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

[tor-commits] [tor/release-0.4.2] Merge branch 'tor-github/pr/1785' into maint-0.3.5

2020-06-30 Thread ahf

commit c3ad2a1d2367d6c0ba5c1c81491770056e881a77
Merge: bebdd2888 5721ec22d
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:47:55 2020 +

Merge branch 'tor-github/pr/1785' into maint-0.3.5

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

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

2020-06-30 Thread ahf

commit aced9be2243e823be3b3d771ae2dc59514fb5eba
Merge: 21cf91ee2 2042ebe88
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4




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

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit 483082b57bfb2535477530fe84d8c92c70be2fa1
Merge: b0bfee8c7 c3ad2a1d2
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-30 Thread ahf

commit 2042ebe88ee49259ec0665032a9bfa39ba6eb9cb
Merge: c57896a76 483082b57
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3




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

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

2020-06-30 Thread ahf

commit 91803c3d56287649099e3f7064c5832880bd0968
Merge: 90f38a3c2 aced9be22
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.4' into release-0.4.4

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

[tor-commits] [tor/release-0.3.5] pem_decode(): Tolerate CRLF line endings

2020-06-30 Thread ahf

commit 5721ec22d8be99a6f24fa69d51d0cbdc4ff21739
Author: Nick Mathewson 
Date:   Wed Mar 11 09:40:04 2020 -0400

pem_decode(): Tolerate CRLF line endings

Fixes bug 33032; bugfix on 0.3.5.1-alpha when we introduced our own
PEM decoder.
---
 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/changes/bug33032 b/changes/bug33032
new file mode 100644
index 0..0c665f25d
--- /dev/null
+++ b/changes/bug33032
@@ -0,0 +1,6 @@
+  o Minor bugfixes (key portability):
+- When reading PEM-encoded key data, tolerate CRLF line-endings even if
+  we are not running on Windows. Previously, non-Windows hosts
+  would reject these line-endings in certain positions, making
+  certain key files hard to move from one host to another.
+  Fixes bug 33032; bugfix on 0.3.5.1-alpha.
diff --git a/src/lib/encoding/pem.c b/src/lib/encoding/pem.c
index 24b238b13..51f37d084 100644
--- a/src/lib/encoding/pem.c
+++ b/src/lib/encoding/pem.c
@@ -85,13 +85,19 @@ pem_decode(uint8_t *dest, size_t destlen, const char *src, 
size_t srclen,
   src = eat_whitespace_eos(src, eos);
 
   char *tag = NULL;
-  tor_asprintf(&tag, "-BEGIN %s-\n", objtype);
+  tor_asprintf(&tag, "-BEGIN %s-", objtype);
   if ((size_t)(eos-src) < strlen(tag) || fast_memneq(src, tag, strlen(tag))) {
 tor_free(tag);
 return -1;
   }
   src += strlen(tag);
   tor_free(tag);
+  /* At this point we insist on spaces (including CR), then an LF. */
+  src = eat_whitespace_eos_no_nl(src, eos);
+  if (src == eos || *src != '\n') {
+/* Extra junk at end of line: this isn't valid. */
+return -1;
+  }
 
   // NOTE lack of trailing \n.  We do not enforce its presence.
   tor_asprintf(&tag, "\n-END %s-", objtype);
diff --git a/src/test/test_pem.c b/src/test/test_pem.c
index 865688b1a..9eb99181e 100644
--- a/src/test/test_pem.c
+++ b/src/test/test_pem.c
@@ -115,8 +115,38 @@ test_crypto_pem_decode(void *arg)
   ;
 }
 
+static void
+test_crypto_pem_decode_crlf(void *arg)
+{
+  (void)arg;
+  char crlf_version[4096];
+  uint8_t buf[4096];
+
+  /* Convert 'expected' to a version with CRLF instead of LF. */
+  const char *inp = expected;
+  char *outp = crlf_version;
+  while (*inp) {
+if (*inp == '\n') {
+  *outp++ = '\r';
+}
+*outp++ = *inp++;
+  }
+  *outp = 0;
+
+  /* Decoding should succeed (or else we have bug 33032 again) */
+  int n = pem_decode(buf, sizeof(buf),
+ crlf_version, strlen(crlf_version),
+ "WOMBAT QUOTE");
+  tt_int_op(n, OP_EQ, strlen(example_pre));
+  tt_mem_op(buf, OP_EQ, example_pre, n);
+
+ done:
+  ;
+}
+
 struct testcase_t pem_tests[] = {
   { "encode", test_crypto_pem_encode, 0, NULL, NULL },
   { "decode", test_crypto_pem_decode, 0, NULL, NULL },
+  { "decode_crlf", test_crypto_pem_decode_crlf, 0, NULL, NULL },
   END_OF_TESTCASES
 };



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.4'

2020-06-30 Thread ahf

commit be7386a6549e523bd8ca3134362c9c01762e8057
Merge: 9e4b47233 aced9be22
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.4'

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

[tor-commits] [tor/release-0.4.3] Merge branch 'tor-github/pr/1785' into maint-0.3.5

2020-06-30 Thread ahf

commit c3ad2a1d2367d6c0ba5c1c81491770056e881a77
Merge: bebdd2888 5721ec22d
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:47:55 2020 +

Merge branch 'tor-github/pr/1785' into maint-0.3.5

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

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

2020-06-30 Thread ahf

commit 483082b57bfb2535477530fe84d8c92c70be2fa1
Merge: b0bfee8c7 c3ad2a1d2
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.4] Merge branch 'tor-github/pr/1785' into maint-0.3.5

2020-06-30 Thread ahf

commit c3ad2a1d2367d6c0ba5c1c81491770056e881a77
Merge: bebdd2888 5721ec22d
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:47:55 2020 +

Merge branch 'tor-github/pr/1785' into maint-0.3.5

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.3.5] Merge branch 'tor-github/pr/1785' into maint-0.3.5

2020-06-30 Thread ahf

commit c3ad2a1d2367d6c0ba5c1c81491770056e881a77
Merge: bebdd2888 5721ec22d
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:47:55 2020 +

Merge branch 'tor-github/pr/1785' into maint-0.3.5

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit 483082b57bfb2535477530fe84d8c92c70be2fa1
Merge: b0bfee8c7 c3ad2a1d2
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)



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

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

2020-06-30 Thread ahf

commit 2042ebe88ee49259ec0665032a9bfa39ba6eb9cb
Merge: c57896a76 483082b57
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3




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

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

2020-06-30 Thread ahf

commit 19d9d0ee53dac7d7411048be5509174d996933f1
Merge: c10323faa 483082b57
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.2' into release-0.4.2

 changes/bug33032   |  6 ++
 src/lib/encoding/pem.c |  8 +++-
 src/test/test_pem.c| 30 ++
 3 files changed, 43 insertions(+), 1 deletion(-)

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

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

2020-06-30 Thread ahf

commit 191a104afd4f565011d5181eb4dced6631fcc2ed
Merge: b7f5113f7 2042ebe88
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:48:49 2020 +

Merge branch 'maint-0.4.3' into release-0.4.3

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

[tor-commits] [tor/maint-0.3.5] Merge branch 'tor-github/pr/1793' into maint-0.3.5

2020-06-30 Thread ahf

commit 8444fbe904141d7954efe221b663efee1774df41
Merge: c3ad2a1d2 8dc7ad127
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:55:39 2020 +

Merge branch 'tor-github/pr/1793' into maint-0.3.5

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)

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

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit c9c4a3d0f60580b7deeadc59a845e272ab8aa949
Merge: 483082b57 8444fbe90
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)

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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-30 Thread ahf

commit 572cf774b974edc83631e8f59dfe18e39f093571
Merge: aced9be22 38f3cf410
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4

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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-30 Thread ahf

commit 38f3cf4103cc87d6de711e5495bdac01bbe47879
Merge: 2042ebe88 c9c4a3d0f
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3




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

[tor-commits] [tor/maint-0.4.4] Merge branch 'tor-github/pr/1793' into maint-0.3.5

2020-06-30 Thread ahf

commit 8444fbe904141d7954efe221b663efee1774df41
Merge: c3ad2a1d2 8dc7ad127
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:55:39 2020 +

Merge branch 'tor-github/pr/1793' into maint-0.3.5

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/maint-0.3.5] Fix unit tests that look at contactinfo logs.

2020-06-30 Thread ahf

commit 8dc7ad1275a53cfe490128e7fb25b759dd7d88b5
Author: Nick Mathewson 
Date:   Thu Mar 12 13:42:17 2020 -0400

Fix unit tests that look at contactinfo logs.
---
 src/test/test_options.c | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 66b0e7ef1..0e52967a2 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -485,7 +485,8 @@ test_options_validate__uname_for_server(void *ignored)
 #endif
 
   options_test_data_t *tdata = get_options_test_data(
-  "ORPort 127.0.0.1:");
+  "ORPort 127.0.0.1:\n"
+  "ContactInfo nob...@example.com");
   setup_capture_of_logs(LOG_WARN);
 
   MOCK(get_uname, fixed_get_uname);
@@ -633,9 +634,11 @@ test_options_validate__contactinfo(void *ignored)
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
   tt_int_op(ret, OP_EQ, -1);
   expect_log_msg(
-"Your ContactInfo config option is not"
-" set. Please consider setting it, so we can contact you if your"
-" server is misconfigured or something else goes wrong.\n");
+   "Your ContactInfo config option is not set. Please strongly "
+   "consider setting it, so we can contact you if your relay is "
+   "misconfigured, end-of-life, or something else goes wrong. It "
+   "is also possible that your relay might get rejected from the "
+   "network due to a missing valid contact address.\n");
   tor_free(msg);
 
   free_options_test_data(tdata);
@@ -645,9 +648,11 @@ test_options_validate__contactinfo(void *ignored)
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
   tt_int_op(ret, OP_EQ, -1);
   expect_no_log_msg(
-"Your ContactInfo config option is not"
-" set. Please consider setting it, so we can contact you if your"
-" server is misconfigured or something else goes wrong.\n");
+   "Your ContactInfo config option is not set. Please strongly "
+   "consider setting it, so we can contact you if your relay is "
+   "misconfigured, end-of-life, or something else goes wrong. It "
+   "is also possible that your relay might get rejected from the "
+   "network due to a missing valid contact address.\n");
   tor_free(msg);
 
  done:



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

[tor-commits] [tor/maint-0.4.2] config: Warn if ContactInfo is not set

2020-06-30 Thread ahf

commit b755a489bdcdf56429c2c7e4fd313b2594dc68c0
Author: David Goulet 
Date:   Tue Feb 18 09:43:13 2020 -0500

config: Warn if ContactInfo is not set

Closes #33361

Signed-off-by: David Goulet 
---
 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/changes/ticket33361 b/changes/ticket33361
new file mode 100644
index 0..bc9715d6a
--- /dev/null
+++ b/changes/ticket33361
@@ -0,0 +1,3 @@
+  o Minor bugfix (relay, configuration):
+- Now warn if the ContactInfo field is not set and mention that the relay
+  might get rejected if so. Fixes bug 33361; bugfix on 0.1.1.10-alpha.
diff --git a/src/app/config/config.c b/src/app/config/config.c
index cbca7d389..1d61b7631 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -3433,10 +3433,15 @@ options_validate(or_options_t *old_options, 
or_options_t *options,
 }
   }
 
-  if (server_mode(options) && !options->ContactInfo)
-log_notice(LD_CONFIG, "Your ContactInfo config option is not set. "
-"Please consider setting it, so we can contact you if your server is "
-"misconfigured or something else goes wrong.");
+  if (server_mode(options) && !options->ContactInfo) {
+log_warn(LD_CONFIG,
+ "Your ContactInfo config option is not set. Please strongly "
+ "consider setting it, so we can contact you if your relay is "
+ "misconfigured, end-of-life, or something else goes wrong. "
+ "It is also possible that your relay might get rejected from "
+ "the network due to a missing valid contact address.");
+  }
+
   const char *ContactInfo = options->ContactInfo;
   if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo)))
 REJECT("ContactInfo config option must be UTF-8.");



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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1793' into maint-0.3.5

2020-06-30 Thread ahf

commit 8444fbe904141d7954efe221b663efee1774df41
Merge: c3ad2a1d2 8dc7ad127
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:55:39 2020 +

Merge branch 'tor-github/pr/1793' into maint-0.3.5

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit c9c4a3d0f60580b7deeadc59a845e272ab8aa949
Merge: 483082b57 8444fbe90
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)




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

[tor-commits] [tor/maint-0.4.2] Merge branch 'tor-github/pr/1793' into maint-0.3.5

2020-06-30 Thread ahf

commit 8444fbe904141d7954efe221b663efee1774df41
Merge: c3ad2a1d2 8dc7ad127
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:55:39 2020 +

Merge branch 'tor-github/pr/1793' into maint-0.3.5

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/maint-0.4.3] Merge branch 'tor-github/pr/1793' into maint-0.3.5

2020-06-30 Thread ahf

commit 8444fbe904141d7954efe221b663efee1774df41
Merge: c3ad2a1d2 8dc7ad127
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:55:39 2020 +

Merge branch 'tor-github/pr/1793' into maint-0.3.5

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/maint-0.4.2] Fix unit tests that look at contactinfo logs.

2020-06-30 Thread ahf

commit 8dc7ad1275a53cfe490128e7fb25b759dd7d88b5
Author: Nick Mathewson 
Date:   Thu Mar 12 13:42:17 2020 -0400

Fix unit tests that look at contactinfo logs.
---
 src/test/test_options.c | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 66b0e7ef1..0e52967a2 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -485,7 +485,8 @@ test_options_validate__uname_for_server(void *ignored)
 #endif
 
   options_test_data_t *tdata = get_options_test_data(
-  "ORPort 127.0.0.1:");
+  "ORPort 127.0.0.1:\n"
+  "ContactInfo nob...@example.com");
   setup_capture_of_logs(LOG_WARN);
 
   MOCK(get_uname, fixed_get_uname);
@@ -633,9 +634,11 @@ test_options_validate__contactinfo(void *ignored)
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
   tt_int_op(ret, OP_EQ, -1);
   expect_log_msg(
-"Your ContactInfo config option is not"
-" set. Please consider setting it, so we can contact you if your"
-" server is misconfigured or something else goes wrong.\n");
+   "Your ContactInfo config option is not set. Please strongly "
+   "consider setting it, so we can contact you if your relay is "
+   "misconfigured, end-of-life, or something else goes wrong. It "
+   "is also possible that your relay might get rejected from the "
+   "network due to a missing valid contact address.\n");
   tor_free(msg);
 
   free_options_test_data(tdata);
@@ -645,9 +648,11 @@ test_options_validate__contactinfo(void *ignored)
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
   tt_int_op(ret, OP_EQ, -1);
   expect_no_log_msg(
-"Your ContactInfo config option is not"
-" set. Please consider setting it, so we can contact you if your"
-" server is misconfigured or something else goes wrong.\n");
+   "Your ContactInfo config option is not set. Please strongly "
+   "consider setting it, so we can contact you if your relay is "
+   "misconfigured, end-of-life, or something else goes wrong. It "
+   "is also possible that your relay might get rejected from the "
+   "network due to a missing valid contact address.\n");
   tor_free(msg);
 
  done:



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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit c9c4a3d0f60580b7deeadc59a845e272ab8aa949
Merge: 483082b57 8444fbe90
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)




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

[tor-commits] [tor/maint-0.3.5] config: Warn if ContactInfo is not set

2020-06-30 Thread ahf

commit b755a489bdcdf56429c2c7e4fd313b2594dc68c0
Author: David Goulet 
Date:   Tue Feb 18 09:43:13 2020 -0500

config: Warn if ContactInfo is not set

Closes #33361

Signed-off-by: David Goulet 
---
 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/changes/ticket33361 b/changes/ticket33361
new file mode 100644
index 0..bc9715d6a
--- /dev/null
+++ b/changes/ticket33361
@@ -0,0 +1,3 @@
+  o Minor bugfix (relay, configuration):
+- Now warn if the ContactInfo field is not set and mention that the relay
+  might get rejected if so. Fixes bug 33361; bugfix on 0.1.1.10-alpha.
diff --git a/src/app/config/config.c b/src/app/config/config.c
index cbca7d389..1d61b7631 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -3433,10 +3433,15 @@ options_validate(or_options_t *old_options, 
or_options_t *options,
 }
   }
 
-  if (server_mode(options) && !options->ContactInfo)
-log_notice(LD_CONFIG, "Your ContactInfo config option is not set. "
-"Please consider setting it, so we can contact you if your server is "
-"misconfigured or something else goes wrong.");
+  if (server_mode(options) && !options->ContactInfo) {
+log_warn(LD_CONFIG,
+ "Your ContactInfo config option is not set. Please strongly "
+ "consider setting it, so we can contact you if your relay is "
+ "misconfigured, end-of-life, or something else goes wrong. "
+ "It is also possible that your relay might get rejected from "
+ "the network due to a missing valid contact address.");
+  }
+
   const char *ContactInfo = options->ContactInfo;
   if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo)))
 REJECT("ContactInfo config option must be UTF-8.");



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

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

2020-06-30 Thread ahf

commit c9c4a3d0f60580b7deeadc59a845e272ab8aa949
Merge: 483082b57 8444fbe90
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)




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

[tor-commits] [tor/release-0.3.5] Fix unit tests that look at contactinfo logs.

2020-06-30 Thread ahf

commit 8dc7ad1275a53cfe490128e7fb25b759dd7d88b5
Author: Nick Mathewson 
Date:   Thu Mar 12 13:42:17 2020 -0400

Fix unit tests that look at contactinfo logs.
---
 src/test/test_options.c | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 66b0e7ef1..0e52967a2 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -485,7 +485,8 @@ test_options_validate__uname_for_server(void *ignored)
 #endif
 
   options_test_data_t *tdata = get_options_test_data(
-  "ORPort 127.0.0.1:");
+  "ORPort 127.0.0.1:\n"
+  "ContactInfo nob...@example.com");
   setup_capture_of_logs(LOG_WARN);
 
   MOCK(get_uname, fixed_get_uname);
@@ -633,9 +634,11 @@ test_options_validate__contactinfo(void *ignored)
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
   tt_int_op(ret, OP_EQ, -1);
   expect_log_msg(
-"Your ContactInfo config option is not"
-" set. Please consider setting it, so we can contact you if your"
-" server is misconfigured or something else goes wrong.\n");
+   "Your ContactInfo config option is not set. Please strongly "
+   "consider setting it, so we can contact you if your relay is "
+   "misconfigured, end-of-life, or something else goes wrong. It "
+   "is also possible that your relay might get rejected from the "
+   "network due to a missing valid contact address.\n");
   tor_free(msg);
 
   free_options_test_data(tdata);
@@ -645,9 +648,11 @@ test_options_validate__contactinfo(void *ignored)
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
   tt_int_op(ret, OP_EQ, -1);
   expect_no_log_msg(
-"Your ContactInfo config option is not"
-" set. Please consider setting it, so we can contact you if your"
-" server is misconfigured or something else goes wrong.\n");
+   "Your ContactInfo config option is not set. Please strongly "
+   "consider setting it, so we can contact you if your relay is "
+   "misconfigured, end-of-life, or something else goes wrong. It "
+   "is also possible that your relay might get rejected from the "
+   "network due to a missing valid contact address.\n");
   tor_free(msg);
 
  done:



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

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

2020-06-30 Thread ahf

commit 572cf774b974edc83631e8f59dfe18e39f093571
Merge: aced9be22 38f3cf410
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4




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

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

2020-06-30 Thread ahf

commit 0c714b2c55feaa9309ca52a4452e8c0b5b365835
Merge: 191a104af 38f3cf410
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.4.3' into release-0.4.3

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

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

2020-06-30 Thread ahf

commit 62727a4ad29d39d0ad584528045205f53ccf3738
Merge: 2eb9af029 8444fbe90
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)

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

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-30 Thread ahf

commit 38f3cf4103cc87d6de711e5495bdac01bbe47879
Merge: 2042ebe88 c9c4a3d0f
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3




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

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-30 Thread ahf

commit c9c4a3d0f60580b7deeadc59a845e272ab8aa949
Merge: 483082b57 8444fbe90
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)




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

[tor-commits] [tor/release-0.4.4] Merge branch 'tor-github/pr/1793' into maint-0.3.5

2020-06-30 Thread ahf

commit 8444fbe904141d7954efe221b663efee1774df41
Merge: c3ad2a1d2 8dc7ad127
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:55:39 2020 +

Merge branch 'tor-github/pr/1793' into maint-0.3.5

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/release-0.4.2] Merge branch 'tor-github/pr/1793' into maint-0.3.5

2020-06-30 Thread ahf

commit 8444fbe904141d7954efe221b663efee1774df41
Merge: c3ad2a1d2 8dc7ad127
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:55:39 2020 +

Merge branch 'tor-github/pr/1793' into maint-0.3.5

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/release-0.3.5] config: Warn if ContactInfo is not set

2020-06-30 Thread ahf

commit b755a489bdcdf56429c2c7e4fd313b2594dc68c0
Author: David Goulet 
Date:   Tue Feb 18 09:43:13 2020 -0500

config: Warn if ContactInfo is not set

Closes #33361

Signed-off-by: David Goulet 
---
 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/changes/ticket33361 b/changes/ticket33361
new file mode 100644
index 0..bc9715d6a
--- /dev/null
+++ b/changes/ticket33361
@@ -0,0 +1,3 @@
+  o Minor bugfix (relay, configuration):
+- Now warn if the ContactInfo field is not set and mention that the relay
+  might get rejected if so. Fixes bug 33361; bugfix on 0.1.1.10-alpha.
diff --git a/src/app/config/config.c b/src/app/config/config.c
index cbca7d389..1d61b7631 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -3433,10 +3433,15 @@ options_validate(or_options_t *old_options, 
or_options_t *options,
 }
   }
 
-  if (server_mode(options) && !options->ContactInfo)
-log_notice(LD_CONFIG, "Your ContactInfo config option is not set. "
-"Please consider setting it, so we can contact you if your server is "
-"misconfigured or something else goes wrong.");
+  if (server_mode(options) && !options->ContactInfo) {
+log_warn(LD_CONFIG,
+ "Your ContactInfo config option is not set. Please strongly "
+ "consider setting it, so we can contact you if your relay is "
+ "misconfigured, end-of-life, or something else goes wrong. "
+ "It is also possible that your relay might get rejected from "
+ "the network due to a missing valid contact address.");
+  }
+
   const char *ContactInfo = options->ContactInfo;
   if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo)))
 REJECT("ContactInfo config option must be UTF-8.");



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

[tor-commits] [tor/release-0.3.5] Merge branch 'tor-github/pr/1793' into maint-0.3.5

2020-06-30 Thread ahf

commit 8444fbe904141d7954efe221b663efee1774df41
Merge: c3ad2a1d2 8dc7ad127
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:55:39 2020 +

Merge branch 'tor-github/pr/1793' into maint-0.3.5

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.4'

2020-06-30 Thread ahf

commit 5e1c0c7dbba994a1317b01b9906a0a30c197541d
Merge: be7386a65 572cf774b
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 14:03:04 2020 +

Merge branch 'maint-0.4.4'

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

[tor-commits] [tor/release-0.4.3] Merge branch 'tor-github/pr/1793' into maint-0.3.5

2020-06-30 Thread ahf

commit 8444fbe904141d7954efe221b663efee1774df41
Merge: c3ad2a1d2 8dc7ad127
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jun 30 13:55:39 2020 +

Merge branch 'tor-github/pr/1793' into maint-0.3.5

 changes/ticket33361 |  3 +++
 src/app/config/config.c | 13 +
 src/test/test_options.c | 19 ---
 3 files changed, 24 insertions(+), 11 deletions(-)



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

1 2 >

1 - 100 of 198 matches

Mail list logo