[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

[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

[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

[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

[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

[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

[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

[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] [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

[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

[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|

[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 ++

[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] [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|

[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 ++

[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

[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|

[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

[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|

[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|

[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

[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] [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] [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

[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] [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

[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

[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

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

2020-06-30 Thread ahf
commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy Date: Tue Jun 30 14:23:17 2020 + Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +-

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

2020-06-30 Thread ahf
commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy Date: Tue Jun 30 14:23:17 2020 + Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +-

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

2020-06-30 Thread ahf
commit dbb70d85bf65d33e0a1035146d71a2a610e91056 Merge: 881f50a9a 8697205be Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +-

[tor-commits] [tor/maint-0.4.2] Preemptive circs should work with UseEntryGuards 0

2020-06-30 Thread ahf
commit 39f2411b3f5ab1a50c74fdafb432d5286c451ab7 Author: Roger Dingledine Date: Sat May 30 01:54:22 2020 -0400 Preemptive circs should work with UseEntryGuards 0 Resume being willing to use preemptively-built circuits when UseEntryGuards is set to 0. We accidentally disabled

[tor-commits] [tor/maint-0.3.5] Preemptive circs should work with UseEntryGuards 0

2020-06-30 Thread ahf
commit 39f2411b3f5ab1a50c74fdafb432d5286c451ab7 Author: Roger Dingledine Date: Sat May 30 01:54:22 2020 -0400 Preemptive circs should work with UseEntryGuards 0 Resume being willing to use preemptively-built circuits when UseEntryGuards is set to 0. We accidentally disabled

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

2020-06-30 Thread ahf
commit fb46d1bb3488a6deedc7172a58554e0953c7df87 Merge: 38f3cf410 881f50a9a Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-30 Thread ahf
commit 8f2571b2339cb1633ff5d84e45d4253195c331c3 Merge: 5e1c0c7db bb5745d65 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.4' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-30 Thread ahf
commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy Date: Tue Jun 30 14:15:57 2020 + Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1

[tor-commits] [tor/maint-0.4.2] sendme: Emit version 1 by default

2020-06-30 Thread ahf
commit ee3e987898a1e656950aabf8bf0a99aed1450a98 Author: David Goulet Date: Tue Mar 17 10:14:57 2020 -0400 sendme: Emit version 1 by default Closes #33623 Signed-off-by: David Goulet --- changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3

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

2020-06-30 Thread ahf
commit 762c8b63cecde03a461d54774a5346dfa7a338cd Merge: 320205ec5 bb5745d65 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-30 Thread ahf
commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy Date: Tue Jun 30 14:15:57 2020 + Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1

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

2020-06-30 Thread ahf
commit bb5745d6568ffcaebbe0c69d8e6865ba5eb163ca Merge: 572cf774b fb46d1bb3 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-30 Thread ahf
commit fb46d1bb3488a6deedc7172a58554e0953c7df87 Merge: 38f3cf410 881f50a9a Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list

[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 +

[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

[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

[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] [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

[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

[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

[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] [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] [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] [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.

[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

[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

[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

[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

[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

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

2020-06-30 Thread ahf
commit 90c313e87c67e58476a52533edede3dcde4d4028 Merge: 8f2571b23 0d5152fc5 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.4' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-30 Thread ahf
commit 5a38c73f7098e5c7e24198ef71dce140d421efcf Merge: fb46d1bb3 2913dbd6d Author: Alexander Færøy Date: Tue Jun 30 14:19:28 2020 + Merge branch 'tor-github/pr/1887' into maint-0.4.3 changes/bug34130 | 4 src/lib/sandbox/sandbox.c | 14 ++ 2 files

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

2020-06-30 Thread ahf
commit 0d5152fc532a6a6738023d01b9a5b89db6ac7757 Merge: bb5745d65 5a38c73f7 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list

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

2020-06-30 Thread ahf
commit 5a38c73f7098e5c7e24198ef71dce140d421efcf Merge: fb46d1bb3 2913dbd6d Author: Alexander Færøy Date: Tue Jun 30 14:19:28 2020 + Merge branch 'tor-github/pr/1887' into maint-0.4.3 changes/bug34130 | 4 src/lib/sandbox/sandbox.c | 14 ++ 2 files

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

2020-06-30 Thread ahf
commit ff4bd6699887ea41c1397ec73fb0f9aea519ec76 Merge: 0a3093533 5a38c73f7 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug34130 | 4 src/lib/sandbox/sandbox.c | 14 ++ 2 files changed, 18

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

2020-06-30 Thread ahf
commit 0d5152fc532a6a6738023d01b9a5b89db6ac7757 Merge: bb5745d65 5a38c73f7 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list

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

2020-06-30 Thread ahf
commit ed85f00419f8a6a29826a416d0d787ca09ff17c0 Merge: 762c8b63c 0d5152fc5 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[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|

[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|

[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 ++

[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

[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

[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

[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

[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] [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

[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 ++

[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|

[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|

[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

[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 +

[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

[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 +

[tor-commits] [tor/release-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

[tor-commits] [tor/release-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

[tor-commits] [tor/master] 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] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4

2020-06-30 Thread ahf
commit 320205ec5477ee3d08d107832355e27ff5fc9d9d Merge: 91803c3d5 572cf774b Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] 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] [tor/maint-0.4.3] 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

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

2020-06-30 Thread ahf
commit 1b106cdedf525546626124449ba90266edb2f2ee Merge: 19d9d0ee5 c9c4a3d0f Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket33361 | 3 +++ src/app/config/config.c | 13 + src/test/test_options.c |

[tor-commits] [tor/master] 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

[tor-commits] [tor/release-0.4.3] 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] [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

[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 |

[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] [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

[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 +

[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 +

[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 +

[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

[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

[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 +

[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

  1   2   >