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

2021-02-03 Thread nickm 
commit 8a17999da3626a5f9e8922277151624cd0526fba
Merge: 0d14ac1e0e 21317c9229
Author: Nick Mathewson 
Date:   Wed Feb 3 13:39:08 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

"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/master] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-02-03 Thread dgoulet 
commit cc5d5a5d1ebf8d42d77713eab11d200770d869e8
Merge: e50648582b a3cef41fc3
Author: David Goulet 
Date:   Wed Feb 3 08:56:38 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 src/core/or/connection_edge.c | 2 +-
 1 file changed, 1 insertion(+), 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.3

2021-02-03 Thread dgoulet 
commit 890a9e89bab8378a511470787253a4aee14fafd0
Merge: cc5d5a5d1e f322ea3fa8
Author: David Goulet 
Date:   Wed Feb 3 09:11:14 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 src/core/or/address_set.c | 75 ---
 src/core/or/address_set.h | 15 --
 2 files changed, 90 deletions(-)

diff --cc src/core/or/address_set.c
index fcddc55e9f,7ada4446c4..9bd3cc0f2d
--- a/src/core/or/address_set.c
+++ b/src/core/or/address_set.c
@@@ -15,9 -15,8 +15,8 @@@
  #include "lib/net/address.h"
  #include "lib/container/bloomfilt.h"
  #include "lib/crypt_ops/crypto_rand.h"
- #include "siphash.h"
  
 -/* Wrap our hash function to have the signature that the bloom filter
 +/** Wrap our hash function to have the signature that the bloom filter
   * needs. */
  static uint64_t
  bloomfilt_addr_hash(const struct sipkey *key,



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

2021-02-03 Thread dgoulet 
commit e50648582b6e0bc7bb37edc08e7a4d67b50f2c53
Merge: 0f8195406e c2cee6c780
Author: David Goulet 
Date:   Wed Feb 3 08:54:40 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 src/core/or/connection_edge.c   |  2 +-
 src/feature/nodelist/nodelist.c | 63 -
 src/feature/nodelist/nodelist.h |  3 +-
 src/test/test_address_set.c | 12 
 4 files changed, 57 insertions(+), 23 deletions(-)




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

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

2021-02-03 Thread dgoulet 
commit 0f8195406e0a2a97a3167d4bb40484f4bd091289
Merge: 705fd37875 98590621bb
Author: David Goulet 
Date:   Wed Feb 3 08:51:36 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 src/core/or/connection_edge.c   | 12 
 src/feature/nodelist/nodelist.c |  8 ++--
 2 files changed, 18 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/master] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-01-28 Thread dgoulet 
commit 79cb47cfc2ed83911f78fa24ba4205bf69958105
Merge: f058db1f3d 9556276f07
Author: David Goulet 
Date:   Thu Jan 28 12:46:31 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/bug33781 |  7 +++
 src/lib/fs/files.c   |  8 +---
 src/test/test_util.c | 49 +
 3 files changed, 61 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/master] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-01-28 Thread dgoulet 
commit f058db1f3d6fee5bc6506ece88cfd100eb86729d
Merge: f3da5f88d7 290007e3c4
Author: David Goulet 
Date:   Thu Jan 28 12:42:31 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/bug40190 | 4 
 src/core/proto/proto_socks.c | 7 ++-
 2 files changed, 10 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.3

2021-01-28 Thread dgoulet 
commit f3da5f88d73f20ba1d28dde973c41e4ec45a02b6
Merge: dd5fbc1bd9 02bd135cb1
Author: David Goulet 
Date:   Thu Jan 28 12:36:42 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/bug40210  | 5 +
 src/ext/keccak-tiny/keccak-tiny.h | 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.3

2021-01-28 Thread dgoulet 
commit dd5fbc1bd9d54d191240ac4e15b5324fb83a903d
Merge: 5c89197c9f 1bdccc03a9
Author: David Goulet 
Date:   Thu Jan 28 12:14:10 2021 -0500

Merge branch 'maint-0.3.5' 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.3

2021-01-28 Thread dgoulet 
commit 6186288eb639e7600c9d7ab482135d44ed78fe21
Merge: a17be1b5b6 045db909c2
Author: David Goulet 
Date:   Thu Jan 28 12:08:20 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/bug40117   | 5 +
 src/feature/rend/rendmid.c | 6 --
 2 files changed, 9 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/master] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-01-28 Thread dgoulet 
commit a17be1b5b619cd5e12a9973df9b9a0cffc40b0ff
Merge: c3ed4b2e56 c6fb26695b
Author: David Goulet 
Date:   Thu Jan 28 12:04:42 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket40165|  5 +
 changes/ticket40170|  3 +++
 configure.ac   | 19 ++-
 src/lib/crypt_ops/compat_openssl.h |  5 -
 src/lib/crypt_ops/crypto_openssl_mgt.c | 13 +++--
 src/lib/crypt_ops/crypto_openssl_mgt.h |  3 +--
 src/test/test_tortls_openssl.c |  3 +--
 7 files changed, 39 insertions(+), 12 deletions(-)




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

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

2021-01-28 Thread nickm 
commit 7ed0fbd88572b9f5519e7907f366c54b8ffb0f25
Merge: 641dce2d6b 3ebf75993f
Author: Nick Mathewson 
Date:   Thu Jan 28 11:17:43 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

"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/master] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-01-21 Thread dgoulet 
commit 641dce2d6bfe382411d5897003b18167fdddfc2b
Merge: c09f8da8a9 65087903d9
Author: David Goulet 
Date:   Thu Jan 21 16:18:43 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 .gitignore | 1 +
 1 file changed, 1 insertion(+)




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

2021-01-21 Thread dgoulet 
commit c09f8da8a98d035082b207ebdaf1e6fe3110c8b7
Merge: 9b390a556e 8500700aa4
Author: David Goulet 
Date:   Thu Jan 21 16:06:54 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 .gitignore |  3 +++
 Makefile.am| 14 ++
 changes/ticket40227|  4 
 scripts/maint/gen_ccls_file.sh | 20 
 4 files changed, 41 insertions(+)




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

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

2021-01-19 Thread nickm 
commit 9b390a556e5030d67c235806b2c027513fb1679f
Merge: b7f886beb4 faf7b550e7
Author: Nick Mathewson 
Date:   Tue Jan 19 12:53:52 2021 -0500

Merge branch 'maint-0.3.5' 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.3

2021-01-19 Thread nickm 
commit a22bfe04bcb106b14e2416e39dc9f43dc82eeba0
Merge: 17eb635532 2d5b21598e
Author: Nick Mathewson 
Date:   Tue Jan 19 12:45:07 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/40241_v2|  4 
 src/core/or/channeltls.c|  4 +---
 src/core/or/circuitlist.c   |  4 +---
 src/feature/client/entrynodes.c |  4 +---
 src/feature/rend/rendclient.c   |  4 +---
 src/lib/log/util_bug.h  | 11 +++
 6 files changed, 19 insertions(+), 12 deletions(-)




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

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

2021-01-13 Thread dgoulet 
commit 17eb6355320c414d83cbc3c1930ec54ae7cd1ea4
Merge: 4b39f46a61 7a82fbfdab
Author: David Goulet 
Date:   Wed Jan 13 10:38:05 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 .gitignore | 3 +++
 1 file changed, 3 insertions(+)




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

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

2021-01-11 Thread nickm 
commit 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b
Merge: 2e7cbd7a9c 6c0f15500b
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:28 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 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.3

2020-11-16 Thread nickm 
commit 7c0778ef7e05e859c62346a795952f127972b35e
Merge: fd22fa183b fcae26adf7
Author: Nick Mathewson 
Date:   Mon Nov 16 22:42:22 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/bug40179_part1  | 4 
 src/test/hs_ntor_ref.py | 6 --
 2 files changed, 8 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/master] Merge branch 'maint-0.3.5' into maint-0.4.3

2020-11-12 Thread nickm 
commit 1fa90a2077af46ba27c34cb45b962e5e48931284
Merge: 3d3dc08ed8 862c44e4ec
Author: Nick Mathewson 
Date:   Thu Nov 12 08:11:20 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

"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/master] Merge branch 'maint-0.3.5' into maint-0.4.3

2020-11-09 Thread nickm 
commit 3d3dc08ed8782e88f1e87a9550b9f18751c5732a
Merge: 6338c35e9d 665083be9f
Author: Nick Mathewson 
Date:   Mon Nov 9 17:13:25 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

"-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/master] Merge branch 'maint-0.3.5' into maint-0.4.3

2020-11-09 Thread nickm 
commit 0b2c64effd7b4c1238e3b4da34f09d670dafd52d
Merge: 4876409c2a 52e439c13e
Author: Nick Mathewson 
Date:   Mon Nov 9 16:13:42 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/bug40080   |  6 ++
 src/core/or/channel.c  |  2 +-
 src/core/or/channel.h  |  3 +++
 src/core/or/circuitbuild.c | 24 
 4 files changed, 30 insertions(+), 5 deletions(-)




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

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

2020-10-28 Thread ahf 
commit 4876409c2aa7deecd5f57474ee6de6ea9e90a855
Merge: 8e7778ec8a dd63b97288
Author: Alexander Færøy 
Date:   Wed Oct 28 15:39:37 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket40133 |  5 ++
 src/core/or/protover.c  |  4 +-
 src/rust/protover/errors.rs |  2 +-
 src/rust/protover/protoset.rs   | 20 +---
 src/rust/protover/protover.rs   | 10 ++--
 src/rust/protover/tests/protover.rs | 60 +++-
 src/test/test_protover.c| 91 +
 7 files changed, 66 insertions(+), 126 deletions(-)

diff --cc src/test/test_protover.c
index f1d1ef0d4a,b4689045cf..7341631ccc
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@@ -22,10 -22,10 +22,10 @@@ test_protover_parse(void *arg
tt_skip();
   done:
;
 -#else
 +#else /* !defined(HAVE_RUST) */
char *re_encoded = NULL;
  
-   const char *orig = "Foo=1,3 Bar=3 Baz= Quux=9-12,14,15-16,900";
+   const char *orig = "Foo=1,3 Bar=3 Baz= Quux=9-12,14,15-16";
smartlist_t *elts = parse_protocol_list(orig);
  
tt_assert(elts);



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

2020-10-07 Thread nickm 
commit 8e7778ec8acbfe081df1e28d43d870ed21442029
Merge: 40f0db75bd 741edf1b45
Author: Nick Mathewson 
Date:   Wed Oct 7 09:29:17 2020 -0400

Merge branch 'maint-0.3.5' 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.3

2020-10-07 Thread nickm 
commit 40f0db75bd3617bc5c4fb76aa62adcf21cea9697
Merge: 884cad3edf b404f085ad
Author: Nick Mathewson 
Date:   Wed Oct 7 08:38:30 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket40003|  3 +++
 src/feature/rend/rendservice.c | 19 +++
 2 files changed, 22 insertions(+)




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

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

2020-10-07 Thread nickm 
commit 3e9fa5a029af55a0175b106199a5371fd87c8e4a
Merge: 701a1936fa 5f5587ee50
Author: Nick Mathewson 
Date:   Wed Oct 7 08:29:31 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket33880   |  6 ++
 src/core/or/channel.c | 32 +---
 2 files changed, 35 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/master] Merge branch 'maint-0.3.5' into maint-0.4.3

2020-10-07 Thread nickm 
commit 701a1936fae48c6887cadd90dbe50ae84a00a29f
Merge: a49373844c ad7ffa5240
Author: Nick Mathewson 
Date:   Wed Oct 7 08:26:04 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket33747| 7 +++
 src/core/mainloop/connection.c | 7 ++-
 src/core/or/connection_st.h| 3 +++
 src/feature/relay/ext_orport.c | 4 
 4 files changed, 20 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.3

2020-10-07 Thread nickm 
commit a49373844cd3c7047759244a6a5c103304d88a7b
Merge: 9587512578 98e14720b5
Author: Nick Mathewson 
Date:   Wed Oct 7 08:16:19 2020 -0400

Merge branch 'maint-0.3.5' 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.3

2020-10-07 Thread nickm 
commit 9587512578e1c45d62e5e97dd9222fe891c835cd
Merge: 902982 968b6c30c1
Author: Nick Mathewson 
Date:   Wed Oct 7 08:10:08 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket40035  |  5 +
 src/lib/tls/tortls_nss.c | 10 ++
 2 files changed, 15 insertions(+)




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

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

2020-10-07 Thread nickm 
commit 90298206d359d3f799ecf8a504bdff493272
Merge: 8a561fc5bf e0e0ef713e
Author: Nick Mathewson 
Date:   Wed Oct 7 08:08:01 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket40073| 3 +++
 src/core/mainloop/connection.c | 9 -
 2 files changed, 11 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.3

2020-10-07 Thread nickm 
commit 8a561fc5bfc48b3d849d62b266d323f98d509a50
Merge: b5a88e8d47 84a5bd48e2
Author: Nick Mathewson 
Date:   Wed Oct 7 08:05:40 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket40081|  6 ++
 src/core/or/channel.c  | 44 ++--
 src/core/or/channel.h  |  9 +++--
 src/core/or/channeltls.c   | 32 ++--
 src/core/or/circuitbuild.c |  2 ++
 src/test/test_channel.c| 12 +---
 6 files changed, 32 insertions(+), 73 deletions(-)




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

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

2020-10-07 Thread nickm 
commit b5a88e8d478e553eb7c6bc022d47a084d6845e64
Merge: beffad8529 ed6a328297
Author: Nick Mathewson 
Date:   Wed Oct 7 08:01:37 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/parallel_unit_test |  4 
 src/test/include.am| 23 ---
 src/test/testing_common.c  | 42 ++
 src/test/unittest_part1.sh |  3 +++
 src/test/unittest_part2.sh |  3 +++
 src/test/unittest_part3.sh |  3 +++
 src/test/unittest_part4.sh |  3 +++
 src/test/unittest_part5.sh |  3 +++
 src/test/unittest_part6.sh |  3 +++
 src/test/unittest_part7.sh |  3 +++
 src/test/unittest_part8.sh |  3 +++
 11 files changed, 90 insertions(+), 3 deletions(-)

diff --cc src/test/include.am
index 90e50752ce,75861fb9ef..33556083df
--- a/src/test/include.am
+++ b/src/test/include.am
@@@ -24,8 -24,14 +24,17 @@@ TESTSCRIPTS = 
src/test/test_workqueue_pipe2.sh \
src/test/test_workqueue_socketpair.sh \
src/test/test_switch_id.sh \
 +  src/test/test_cmdline.sh \
-   src/test/test_parseconf.sh
++  src/test/test_parseconf.sh \
++  src/test/test_switch_id.sh \
+ src/test/unittest_part1.sh \
+ src/test/unittest_part2.sh \
+ src/test/unittest_part3.sh \
+ src/test/unittest_part4.sh \
+ src/test/unittest_part5.sh \
+ src/test/unittest_part6.sh \
+ src/test/unittest_part7.sh \
+ src/test/unittest_part8.sh
  
  if USE_RUST
  TESTSCRIPTS += \
@@@ -33,27 -39,11 +42,27 @@@
  endif
  
  if USEPYTHON
 -TESTSCRIPTS += src/test/test_ntor.sh src/test/test_hs_ntor.sh 
src/test/test_bt.sh
 +TESTSCRIPTS += \
 +  src/test/test_ntor.sh \
 +  src/test/test_hs_ntor.sh \
 +  src/test/test_bt.sh \
 +  scripts/maint/practracker/test_practracker.sh
 +
 +if COVERAGE_ENABLED
 +# ...
 +else
 +# Only do this when coverage is not on, since it invokes lots of code
 +# in a kind of unpredictable way.
  TESTSCRIPTS += src/test/test_rebind.sh
  endif
 +endif
 +
 +if USE_PERL
 +TESTSCRIPTS += \
 +scripts/maint/checkSpaceTest.sh
 +endif
  
- TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
+ TESTS += src/test/test-slow src/test/test-memwipe \
src/test/test_workqueue \
src/test/test_keygen.sh \
src/test/test_key_expiration.sh \
@@@ -431,8 -378,14 +440,16 @@@ EXTRA_DIST += 
src/test/test_workqueue_pipe.sh \
src/test/test_workqueue_pipe2.sh \
src/test/test_workqueue_socketpair.sh \
 +  src/test/test_cmdline.sh \
-   src/test/test_parseconf.sh
++  src/test/test_parseconf.sh \
+ src/test/unittest_part1.sh \
+ src/test/unittest_part2.sh \
+ src/test/unittest_part3.sh \
+ src/test/unittest_part4.sh \
+ src/test/unittest_part5.sh \
+ src/test/unittest_part6.sh \
+ src/test/unittest_part7.sh \
+ src/test/unittest_part8.sh
  
  test-rust:
$(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh"
diff --cc src/test/testing_common.c
index e9aa4112c0,daa7aa524a..d7c6edb646
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@@ -282,10 -276,10 +282,12 @@@ main(int c, const char **v
tor_libevent_initialize();
  
control_initialize_event_queue();
 -  configure_backtrace_handler(get_version());
 +
 +  /* Don't add default logs; the tests manage their own. */
 +  quiet_level = QUIET_SILENT;
  
+   unsigned num=1, den=1;
+ 
for (i_out = i = 1; i < c; ++i) {
  if (!strcmp(v[i], "--warn")) {
loglevel = LOG_WARN;



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

2020-09-22 Thread dgoulet 
commit beffad8529c9b603bcf6b6e720747f6210c5c25c
Merge: 0d78fbb718 faf89ec6c2
Author: David Goulet 
Date:   Tue Sep 22 13:47:08 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket40135  | 3 +++
 src/feature/hs_common/shared_random_client.c | 4 
 2 files changed, 3 insertions(+), 4 deletions(-)




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

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

2020-09-21 Thread nickm 
commit 0d78fbb718ae44aaf739ec644e7d5f3ae65771ea
Merge: b643ced022 8458c8211e
Author: Nick Mathewson 
Date:   Mon Sep 21 12:59:03 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 .gitlab-ci.yml  | 46 ++
 scripts/ci/ci-driver.sh | 20 
 2 files changed, 66 insertions(+)



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

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

2020-09-18 Thread nickm 
commit b643ced0224268dfe3d9c3617b3a77f8aec6205e
Merge: 2ddbfc64af 0b77c706a1
Author: Nick Mathewson 
Date:   Fri Sep 18 19:06:16 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 .gitlab-ci.yml  | 27 ++-
 scripts/ci/ci-driver.sh |  5 +
 2 files changed, 31 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.3

2020-09-18 Thread dgoulet 
commit 2ddbfc64afe94b74a2b9856f2e85e3bd38323db2
Merge: 078194ecaf 7945e075a4
Author: David Goulet 
Date:   Fri Sep 18 09:45:25 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket40126   | 4 
 src/test/test_rendcache.c | 1 +
 2 files changed, 5 insertions(+)




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

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

2020-09-17 Thread nickm 
commit 078194ecafebfff2f6aa37868539ccee15ebe73c
Merge: 7915b651d9 47f1d19f8e
Author: Nick Mathewson 
Date:   Thu Sep 17 13:56:40 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket40125   | 4 
 src/test/test_rendcache.c | 2 ++
 2 files changed, 6 insertions(+)




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