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

2020-08-13 Thread nickm 
commit 45d983049382e09d14d5047f9eef941d089e9fb7
Merge: 07f0210a05 72484a4953
Author: Nick Mathewson 
Date:   Thu Aug 13 14:20:39 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40099  | 4 
 src/test/test_rendcache.c | 2 +-
 2 files changed, 5 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-08-12 Thread nickm 
commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5
Merge: 02bb719a94 aeafb7f44f
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 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.3.5' into maint-0.4.2

2020-08-12 Thread nickm 
commit 02bb719a9494a010b3cad4cf81942ec7619f5806
Merge: 6ef40144ae f5b9471547
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 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.3.5' into maint-0.4.2

2020-08-12 Thread nickm 
commit 6ef40144aeacdf13126d61c2686cc470b6c5
Merge: c6c0af403c 8182f1351a
Author: Nick Mathewson 
Date:   Wed Aug 12 08:39:41 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .appveyor.yml | 8 
 1 file changed, 8 deletions(-)



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

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

2020-08-11 Thread nickm 
commit c6c0af403c9b8dccba96677b60d86670a651893d
Merge: da8577bb75 adb7268236
Author: Nick Mathewson 
Date:   Tue Aug 11 12:37:08 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  |  5 +++--
 scripts/ci/ci-driver.sh | 27 ++-
 2 files changed, 29 insertions(+), 3 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.3.5' into maint-0.4.2

2020-08-11 Thread nickm 
commit da8577bb7579af1355688d459b2774f995c43b53
Merge: e4a6d9d5a9 aa2c93b90b
Author: Nick Mathewson 
Date:   Tue Aug 11 11:03:24 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 scripts/ci/ci-driver.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



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

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

2020-08-11 Thread nickm 
commit e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b
Merge: 68f8250cbb 8a0f530adf
Author: Nick Mathewson 
Date:   Tue Aug 11 10:44:40 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 5 +
 scripts/ci/ci-driver.sh | 5 +
 2 files changed, 10 insertions(+)



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

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

2020-08-10 Thread nickm 
commit 68f8250cbb6f1844e7f16f5f1bc8063b8bbfdf14
Merge: 352991c843 e873c7e893
Author: Nick Mathewson 
Date:   Mon Aug 10 19:32:49 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml| 120 ++--
 scripts/ci/ci-driver.sh   | 424 ++
 src/feature/rend/rendclient.c |   4 +-
 3 files changed, 533 insertions(+), 15 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.3.5' into maint-0.4.2

2020-08-06 Thread nickm 
commit 352991c843e2c0404fd44178cbf3df32cc365bc1
Merge: 4e684c8695 bac8967e24
Author: Nick Mathewson 
Date:   Thu Aug 6 13:24:11 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml | 32 ++--
 1 file changed, 2 insertions(+), 30 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.3.5' into maint-0.4.2

2020-07-30 Thread ahf 
commit 4e684c8695e4654d841644fe9c13e70eabd191b9
Merge: cdb0e6c252 c4742b89b2
Author: Alexander Færøy 
Date:   Fri Jul 31 02:03:34 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40076|  5 
 src/lib/buf/buffers.c   |  2 ++
 src/test/test_buffers.c | 64 +
 3 files changed, 71 insertions(+)




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

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

2020-07-29 Thread nickm 
commit cdb0e6c2522aac372c9a816300dacfd62856dd48
Merge: c0bc30b6f0 dcc60294ad
Author: Nick Mathewson 
Date:   Wed Jul 29 12:37:07 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug31036| 3 +++
 src/lib/fdio/fdio.c | 6 +++---
 2 files changed, 6 insertions(+), 3 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.3.5' into maint-0.4.2

2020-07-27 Thread nickm 
commit c0bc30b6f0f643e06abfb70f18126155663ec4cc
Merge: 3bcbd69a77 564a9a54a1
Author: Nick Mathewson 
Date:   Mon Jul 27 12:56:18 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 src/app/config/fallback_dirs.inc | 15 ---
 1 file changed, 15 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.3.5' into maint-0.4.2

2020-07-23 Thread nickm 
commit 3bcbd69a776f0602fd8524a1a24fbe60666dd77f
Merge: 49b4d1765c f916ddd312
Author: Nick Mathewson 
Date:   Thu Jul 23 10:09:14 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/ticket40061  |   5 +
 src/app/config/fallback_dirs.inc | 503 ++-
 2 files changed, 238 insertions(+), 270 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.3.5' into maint-0.4.2

2020-07-09 Thread nickm 
commit 6e01d5e68506056b1c9ec6b19a60911b15512bd8
Merge: 5aaecf6d0 c9751e261
Author: Nick Mathewson 
Date:   Thu Jul 9 13:14:22 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

`-s ours` to avoid version bump.




___
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-07-09 Thread nickm 
commit 78285594f51fc0009d3911fb894e12b793536a5d
Merge: 283ce30c5 0bb227d17
Author: Nick Mathewson 
Date:   Thu Jul 9 10:30:03 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

`-s ours` to avoid version bump.




___
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-07-09 Thread nickm 
commit 283ce30c536568129f0a2b531d4c195c93c7ff52
Merge: b81e24cda 7142f3e43
Author: Nick Mathewson 
Date:   Thu Jul 9 09:28:53 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug33119   |  4 +++
 src/lib/tls/tortls_nss.c   | 47 +++
 src/test/test_tortls.c | 73 ++
 src/test/test_tortls_openssl.c | 70 
 4 files changed, 118 insertions(+), 76 deletions(-)

diff --cc src/test/test_tortls_openssl.c
index 81e2d3aa4,f039980a2..93135d0b1
--- a/src/test/test_tortls_openssl.c
+++ b/src/test/test_tortls_openssl.c
@@@ -477,77 -477,8 +477,8 @@@ fake_x509_free(X509 *cert
  tor_free(cert);
}
  }
 -#endif
 +#endif /* !defined(OPENSSL_OPAQUE) */
  
- static tor_x509_cert_t *fixed_x509_cert = NULL;
- static tor_x509_cert_t *
- get_peer_cert_mock_return_fixed(tor_tls_t *tls)
- {
-   (void)tls;
-   if (fixed_x509_cert)
- return tor_x509_cert_dup(fixed_x509_cert);
-   else
- return NULL;
- }
- 
- static void
- test_tortls_cert_matches_key(void *ignored)
- {
-   (void)ignored;
- 
-   X509 *cert1 = NULL, *cert2 = NULL, *cert3 = NULL, *cert4 = NULL;
-   tor_x509_cert_t *c1 = NULL, *c2 = NULL, *c3 = NULL, *c4 = NULL;
-   crypto_pk_t *k1 = NULL, *k2 = NULL, *k3 = NULL;
- 
-   k1 = pk_generate(1);
-   k2 = pk_generate(2);
-   k3 = pk_generate(3);
- 
-   cert1 = tor_tls_create_certificate(k1, k2, "A", "B", 1000);
-   cert2 = tor_tls_create_certificate(k1, k3, "C", "D", 1000);
-   cert3 = tor_tls_create_certificate(k2, k3, "C", "D", 1000);
-   cert4 = tor_tls_create_certificate(k3, k2, "E", "F", 1000);
- 
-   tt_assert(cert1 && cert2 && cert3 && cert4);
- 
-   c1 = tor_x509_cert_new(cert1); cert1 = NULL;
-   c2 = tor_x509_cert_new(cert2); cert2 = NULL;
-   c3 = tor_x509_cert_new(cert3); cert3 = NULL;
-   c4 = tor_x509_cert_new(cert4); cert4 = NULL;
- 
-   tt_assert(c1 && c2 && c3 && c4);
- 
-   MOCK(tor_tls_get_peer_cert, get_peer_cert_mock_return_fixed);
- 
-   fixed_x509_cert = NULL;
-   /* If the peer has no certificate, it shouldn't match anything. */
-   tt_assert(! tor_tls_cert_matches_key(NULL, c1));
-   tt_assert(! tor_tls_cert_matches_key(NULL, c2));
-   tt_assert(! tor_tls_cert_matches_key(NULL, c3));
-   tt_assert(! tor_tls_cert_matches_key(NULL, c4));
-   fixed_x509_cert = c1;
-   /* If the peer has a certificate, it should match every cert with the same
-* subject key. */
-   tt_assert(tor_tls_cert_matches_key(NULL, c1));
-   tt_assert(tor_tls_cert_matches_key(NULL, c2));
-   tt_assert(! tor_tls_cert_matches_key(NULL, c3));
-   tt_assert(! tor_tls_cert_matches_key(NULL, c4));
- 
-  done:
-   tor_x509_cert_free(c1);
-   tor_x509_cert_free(c2);
-   tor_x509_cert_free(c3);
-   tor_x509_cert_free(c4);
-   if (cert1) X509_free(cert1);
-   if (cert2) X509_free(cert2);
-   if (cert3) X509_free(cert3);
-   if (cert4) X509_free(cert4);
-   crypto_pk_free(k1);
-   crypto_pk_free(k2);
-   crypto_pk_free(k3);
-   UNMOCK(tor_tls_get_peer_cert);
- }
- 
  #ifndef OPENSSL_OPAQUE
  static void
  test_tortls_cert_get_key(void *ignored)



___
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-07-07 Thread ahf 
commit b81e24cda687e9633c18b741ed92ce6bafb77643
Merge: 19d579e8c 3e08dd9df
Author: Alexander Færøy 
Date:   Wed Jul 8 00:36:47 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 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-07-07 Thread ahf 
commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963
Merge: 07d8d398c d9cc2b292
Author: Alexander Færøy 
Date:   Tue Jul 7 14:48:35 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 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-07-02 Thread dgoulet 
commit 07d8d398ca8961d2d9155a2df9c7ced6b382e73b
Merge: dbb70d85b 39830b640
Author: David Goulet 
Date:   Thu Jul 2 07:20:57 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug16016  | 4 
 src/feature/nodelist/routerlist.c | 6 +-
 2 files changed, 9 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-07-01 Thread asn 
commit 38208185be063cfe575f97b99b3270210fbd0a8c
Merge: dbb70d85b 9beae0271
Author: George Kadianakis 
Date:   Wed Jul 1 12:55:02 2020 +0300

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/ticket33346   | 3 +++
 src/lib/sandbox/sandbox.c | 3 +++
 2 files changed, 6 insertions(+)




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

[tor-commits] [tor/maint-0.4.4] 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 +-
 src/feature/client/entrynodes.c | 8 +++-
 3 files changed, 13 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/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.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.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/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-06-29 Thread nickm 
commit fd8ce812b0a7263b75096207a735c02945320c86
Merge: 0f218a05a 0c0214bcc
Author: Nick Mathewson 
Date:   Mon Jun 29 12:55:35 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/ticket28992|  3 +++
 src/feature/hs/hs_client.c | 11 ---
 2 files changed, 11 insertions(+), 3 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.3.5' into maint-0.4.2

2020-06-12 Thread dgoulet 
commit 0f218a05a6d8271639a81ec2667f86ef1aa38e66
Merge: 193082895 6a43aadec
Author: David Goulet 
Date:   Fri Jun 12 12:55:41 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .travis.yml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)




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