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

2021-06-14 Thread nickm
commit 88b54f2a5b281558d19793267be54b4d6e5813e7 Merge: dbe8cd3642 253b83b722 Author: Nick Mathewson Date: Mon Jun 14 11:49:01 2021 -0400 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.4' into release-0.4.4

2021-06-14 Thread nickm
commit 7c07cf1afc725c5e1df87dae05d3960740218f88 Merge: 27a8bac500 0ae9fd62fd Author: Nick Mathewson Date: Thu Jun 10 12:30:29 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40392 | 4 src/feature/hs/hs_descriptor.c | 3 ++- 2 files changed, 6

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

2021-06-14 Thread nickm
commit 27a8bac5009a53194025795fe81d0c1e43bead38 Merge: 096644038c 014345ed6a Author: Nick Mathewson Date: Thu Jun 10 09:55:55 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 src/core/or/relay.c | 24 +++- 1 file changed, 3 insertions(+), 21 deletions(-)

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

2021-06-14 Thread nickm
commit 096644038cef709b04bf5af49d1f1c3e8a05527a Merge: 15617f29cb 0f2d45328d Author: Nick Mathewson Date: Thu Jun 10 08:53:07 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40389 | 3 +++ src/core/or/relay.c | 39 +++ 2 files

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

2021-06-14 Thread nickm
commit aa4da024ad5aac5630ca957bcc9b521185d12f3f Merge: 0e2d413d2e 7c19a4d924 Author: Nick Mathewson Date: Thu Jun 10 08:37:34 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40390 | 8 src/lib/crypt_ops/crypto_rand.c | 4 ++-- 2 files changed,

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

2021-06-14 Thread nickm
commit 15617f29cb8a067ac399557cc6e72e0a415946da Merge: aa4da024ad 31eaa81f59 Author: Nick Mathewson Date: Thu Jun 10 08:42:15 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40391 | 9 + src/core/or/circuitmux.c | 7 --- 2 files changed, 13

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

2021-06-14 Thread nickm
commit 0e2d413d2ede3b79338c41b3be6e3c7ba0146e5d Merge: 6378002d2d 57a41348ee Author: Nick Mathewson Date: Thu Jun 10 08:21:48 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/geoip-2021-06-10 |3 + src/config/geoip | 4764

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

2021-06-07 Thread nickm
commit bffba45796f4d4521c817e995d1f6055d9fef43a Merge: f66fa8eba5 1956f63d6b Author: Nick Mathewson Date: Mon Jun 7 13:32:35 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2021-05-25 Thread ahf
commit f66fa8eba58bb0d646e74923993ba4ebf79e4df5 Merge: ef88ceedba 11c7e65730 Author: Alexander Færøy Date: Tue May 25 13:25:23 2021 + Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40399 | 5 + src/lib/tls/tortls.h | 1 -

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

2021-05-07 Thread nickm
commit ef88ceedba47c26f65e6122eadcaa739564d3778 Merge: 49740f020d 48dd87933d Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+),

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

2021-05-07 Thread nickm
commit 49740f020da8da6866953e1b2f55a2d5faf33876 Merge: 6088a73c73 f68aeda549 Author: Nick Mathewson Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-04-21 Thread nickm
commit 6088a73c733d02f6b589c429040c898141287670 Merge: eff0682842 87d96f7162 Author: Nick Mathewson Date: Wed Apr 21 10:34:28 2021 -0400 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.4' into release-0.4.4

2021-04-14 Thread dgoulet
commit eff0682842980117d14cc783bb32baa3c5837c39 Merge: bb6362c06c bba3393d20 Author: David Goulet Date: Wed Apr 14 08:39:16 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-)

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

2021-04-13 Thread nickm
commit bb6362c06c713fd4fd0611b50d05b67ee05d2e74 Merge: f84ed7edaf 59f6248e09 Author: Nick Mathewson Date: Tue Apr 13 16:59:16 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40265 |3 + src/app/config/fallback_dirs.inc | 1040

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

2021-04-13 Thread nickm
commit f84ed7edafb1acbccf4d8f01d80f9020cb6010c7 Merge: 44df63e591 b323e6b8c2 Author: Nick Mathewson Date: Tue Apr 13 10:36:00 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/geoip-2021-04-13 | 3 + src/config/geoip | 10953

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

2021-03-24 Thread nickm
commit 44df63e591feec5d5ae5c4a838664997bc64f489 Merge: a93f736337 9ca2394d6b Author: Nick Mathewson Date: Wed Mar 24 12:25:05 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40345 | 5 + src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1

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

2021-03-16 Thread nickm
commit a93f7363378f90a2faf98f7a3e67707b1be37362 Merge: fecc195294 94fb308c5d Author: Nick Mathewson Date: Tue Mar 16 09:18:52 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2021-03-16 Thread nickm
commit b3c891119c7853410005f26aa86a296da3d0b889 Merge: 4a538847a8 2eb900f7e2 Author: Nick Mathewson Date: Mon Mar 15 08:54:00 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40286_minimal| 7 --- src/feature/dirparse/unparseable.c | 7 +-- 2 files

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

2021-03-16 Thread nickm
commit 4a538847a802650b1d5ced8c97372d60f5ec0906 Merge: c63e09043a b9f6539008 Author: Nick Mathewson Date: Mon Mar 15 08:52:28 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2 files

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

2021-03-16 Thread nickm
commit 15bac08f1c16359670bb9569995bf24764d3fb8b Merge: ecdc6ac498 f2cfd1ffad Author: Nick Mathewson Date: Mon Mar 15 09:41:38 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 Makefile.am | 1 - 1 file changed, 1 deletion(-) ___

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

2021-03-16 Thread nickm
commit c63e09043a357c2bf39f37433baa18b365309869 Merge: 1a407612bc fb2c889a38 Author: Nick Mathewson Date: Mon Mar 15 07:42:55 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2021-03-16 Thread nickm
commit ecf1ba974621f954368a3d3d0232b8094a15e745 Merge: b3c891119c 5ec579610a Author: Nick Mathewson Date: Mon Mar 15 09:01:59 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40316 | 5 + src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6

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

2021-03-12 Thread nickm
commit 1a407612bca7412f20d06bfe3353708faa2adefb Merge: 877f7bbb47 9f59b6f458 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 LICENSE | 43 ++- changes/geoip-2021-03-12 | 2

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

2021-03-12 Thread nickm
commit 877f7bbb4710ae6a67cb1ad633124109e751e7ed Merge: 34ad10db54 41796158e6 Author: Nick Mathewson Date: Fri Mar 12 11:30:21 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/geoip-2021-03-12 | 9 + src/config/geoip | 144354

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

2021-03-01 Thread dgoulet
commit 34ad10db54a76ed23ea377b24769cbc60036d49d Merge: a9e3f73d67 eb1759633a Author: David Goulet Date: Mon Mar 1 08:33:47 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 -

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

2021-02-05 Thread ahf
commit a9e3f73d67d2d5ab760cb291e18e3f259c3ff5e7 Merge: d9bfe60561 49c61c1bb8 Author: Alexander Færøy Date: Fri Feb 5 19:19:34 2021 + Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits

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

2021-02-05 Thread ahf
commit d9bfe605610181688313d9e5975fd517c8db9e3d Merge: 817cf01831 aa1a053d55 Author: Alexander Færøy Date: Fri Feb 5 17:40:25 2021 + Merge branch 'maint-0.4.4' into release-0.4.4 scripts/maint/practracker/exceptions.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

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

2021-02-05 Thread ahf
commit 817cf018312f5788c92bbf49fe07b3a0698f11e7 Merge: 4b332ce62a 62b98716ff Author: Alexander Færøy Date: Fri Feb 5 17:17:04 2021 + Merge branch 'maint-0.4.4' into release-0.4.4 scripts/maint/practracker/exceptions.txt | 1 + src/test/test_switch_id.c| 4 ++-- 2

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

2021-02-05 Thread ahf
commit 4b332ce62a2f661036febca494f2c1f6a03d52b2 Merge: 306e8f87bc 6578a3e865 Author: Alexander Færøy Date: Fri Feb 5 16:05:57 2021 + Merge branch 'maint-0.4.4' into release-0.4.4 src/test/test_switch_id.c | 60 --- 1 file changed, 57

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

2021-02-03 Thread nickm
commit 306e8f87bcd73461e66386c5e387d4aa2dfb4090 Merge: 926432845b 2933c37188 Author: Nick Mathewson Date: Wed Feb 3 13:39:55 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2021-02-03 Thread dgoulet
commit 3e618aae1a81bd1e5e6a49bc508c48dd38d9ef18 Merge: 509a14178a b2434d30d2 Author: David Goulet Date: Wed Feb 3 08:44:19 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket2667 | 4 ++ src/core/or/address_set.c | 74

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

2021-02-03 Thread dgoulet
commit 86a55bd02fbf05a4865cc2f0f4f394c9e27c7318 Merge: dc5e06dfd4 61e38deb56 Author: David Goulet Date: Wed Feb 3 09:11:15 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 src/core/or/address_set.c | 75 --- src/core/or/address_set.h |

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

2021-02-03 Thread dgoulet
commit 5484a9db78a236e8537d33b7bfc1ec09cab3e96b Merge: 3e618aae1a 36b51a1c71 Author: David Goulet Date: Wed Feb 3 08:51:37 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 src/core/or/connection_edge.c | 12 src/feature/nodelist/nodelist.c | 8 ++-- 2 files

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

2021-02-03 Thread dgoulet
commit dc5e06dfd485487549c23f2effd8d7549c76cd01 Merge: 5e0fe4a38c eda81ea27e Author: David Goulet Date: Wed Feb 3 08:56:38 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 src/core/or/connection_edge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2021-02-03 Thread dgoulet
commit 5e0fe4a38c5010f543856bfc8f14cbcd1e636ccd Merge: 5484a9db78 903bfc4eca Author: David Goulet Date: Wed Feb 3 08:54:40 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 src/core/or/connection_edge.c | 2 +- src/feature/nodelist/nodelist.c | 63

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

2021-01-28 Thread dgoulet
commit b256d83c3ea8a417ddaa896ede6d4a1ceaa3fab7 Merge: 61d66c8cb5 ea38016202 Author: David Goulet Date: Thu Jan 28 12:46:31 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug33781 | 7 +++ src/lib/fs/files.c | 8 +--- src/test/test_util.c | 49

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

2021-01-28 Thread dgoulet
commit 61d66c8cb5e26731bec34b0b645787643da9f1f0 Merge: 6999a05008 be81ecba3a Author: David Goulet Date: Thu Jan 28 12:42:32 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40190 | 4 src/core/proto/proto_socks.c | 7 ++- 2 files changed, 10

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

2021-01-28 Thread dgoulet
commit 6999a0500854361c3eae250ffee3c9b1cd8ce22f Merge: 09abca6f9c a3f2bc8f13 Author: David Goulet Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40210 | 5 + src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6

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

2021-01-28 Thread dgoulet
commit 09abca6f9c363befd9a0a007234851378ff335c3 Merge: 3e9cdf8b5a 2c4a2a93d3 Author: David Goulet Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40237 | 5 +++ src/core/mainloop/mainloop.c | 3 +-

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

2021-01-28 Thread dgoulet
commit 3e9cdf8b5a3c5188ff044faa00c0d84a01cde4ce Merge: c0f4211626 ed0fcfd2b8 Author: David Goulet Date: Thu Jan 28 12:08:21 2021 -0500 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.4' into release-0.4.4

2021-01-28 Thread dgoulet
commit c0f4211626643d17628b1271e82fc6186aecfea1 Merge: c3e46fe931 737cd79c42 Author: David Goulet Date: Thu Jan 28 12:04:42 2021 -0500 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.4' into release-0.4.4

2021-01-28 Thread dgoulet
commit c3e46fe93199b47edb8c975afc830413dde54f8b Merge: 7178b59b21 07540e2a18 Author: David Goulet Date: Thu Jan 28 12:02:43 2021 -0500 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.4' into release-0.4.4

2021-01-28 Thread dgoulet
commit 7178b59b2123f08afc676a1d54be2db48416d432 Merge: 637d7c25df bf29d3b4ae Author: David Goulet Date: Thu Jan 28 12:00:17 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40165| 5 + changes/ticket40170| 3 +++

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

2021-01-28 Thread nickm
commit 637d7c25df5d250699c7f94ea9d5dfc049d5fbf5 Merge: 5a131c35ee f8fea8b979 Author: Nick Mathewson Date: Thu Jan 28 11:20:20 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2021-01-21 Thread dgoulet
commit 5a131c35ee65e7f7385598ebc8f725d3fc485570 Merge: 5110b15cee 09a1a34ad1 Author: David Goulet Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 .gitignore | 1 + 1 file changed, 1 insertion(+) ___

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

2021-01-21 Thread dgoulet
commit 5110b15cee4de3d05ee840d3d4b891a88d389333 Merge: a221f11483 2a3cf37450 Author: David Goulet Date: Thu Jan 21 16:06:54 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 .gitignore | 3 +++ Makefile.am| 14 ++

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

2021-01-19 Thread nickm
commit a221f114835931fef24de83915a988e5bf08a4f9 Merge: 428d5eea11 d54cd853ad Author: Nick Mathewson Date: Tue Jan 19 12:53:52 2021 -0500 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.4' into release-0.4.4

2021-01-19 Thread nickm
commit 428d5eea11f82d3b07c33d9660c0903a86eaaddf Merge: d9f671e933 4c82c2d1d4 Author: Nick Mathewson Date: Tue Jan 19 12:49:30 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/40241_v2| 4 src/core/or/channeltls.c| 4 +---

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

2021-01-13 Thread dgoulet
commit d9f671e933fb9c218e188005feeaff37310dd3b0 Merge: e0caedee16 61ee17eb1e Author: David Goulet Date: Wed Jan 13 10:38:05 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 .gitignore | 3 +++ 1 file changed, 3 insertions(+) ___

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

2021-01-11 Thread nickm
commit e0caedee163b6861dc2e6be23a4e21c39503172d Merge: 498807b499 5a822b462a Author: Nick Mathewson Date: Mon Jan 11 14:37:29 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/40241 | 4 src/core/or/channeltls.c| 3 ++-

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

2020-11-19 Thread ahf
commit 498807b499654898a73d6867ab0c799cbe6d1a78 Merge: 615a38f052 77bb4b0838 Author: Alexander Færøy Date: Thu Nov 19 17:43:59 2020 + Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40179_part2 | 4 src/test/test_config.c | 6 -- 2 files changed, 8 insertions(+),

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

2020-11-16 Thread nickm
commit 615a38f05274e8c3fee24ebe8f5763f03d7b9c32 Merge: 4559aa8b51 9001732394 Author: Nick Mathewson Date: Mon Nov 16 22:42:22 2020 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40179_part1 | 4 src/test/hs_ntor_ref.py | 6 -- 2 files changed, 8 insertions(+), 2

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

2020-11-12 Thread nickm
commit 4559aa8b51c21eee40a529b988d8910023c2b54c Merge: 2a8b789ea6 3f1544bbd9 Author: Nick Mathewson Date: Thu Nov 12 08:13:38 2020 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-11-09 Thread nickm
commit 6585289fe75c07816ba9eed204df9f73215cc262 Merge: bb00238432 494ced690d Author: Nick Mathewson Date: Mon Nov 9 17:14:58 2020 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-11-09 Thread nickm
commit 62ca07b1fd8d9e3dacf6d82610e6318f4705a820 Merge: adf81fb757 ec0f000445 Author: Nick Mathewson Date: Mon Nov 9 16:17:50 2020 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40080 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/channel.h |

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

2020-10-28 Thread ahf
commit adf81fb757853b0185873e251b8620d05f15cee1 Merge: 35ae8d4e8f b0e6ec627c Author: Alexander Færøy Date: Wed Oct 28 15:39:37 2020 + Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40133 | 5 ++ src/core/or/protover.c | 4 +-

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

2020-10-27 Thread dgoulet
commit 35ae8d4e8f497cfff40334c8c5fbc19746a15fb7 Merge: fd2f79cacf 26cfac1880 Author: David Goulet Date: Tue Oct 27 10:20:05 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40162 | 7 ++ src/feature/dirauth/dirvote.h | 52

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

2020-10-26 Thread nickm
commit fd2f79cacf37b63d6d78980d7689df9097606afb Merge: 822585cf3f c1bcc1da03 Author: Nick Mathewson Date: Mon Oct 26 16:39:31 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40164 | 6 ++ doc/tor.1.txt | 3 ++-

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

2020-10-07 Thread nickm
commit 822585cf3f1fbc3d9ee75ef52cb7443bb5bb6399 Merge: 15c93cba3b ef70f5f42a Author: Nick Mathewson Date: Wed Oct 7 09:29:17 2020 -0400 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.4' into release-0.4.4

2020-10-07 Thread nickm
commit 15c93cba3b492065faf48a8aaaeae32b0f152b34 Merge: fc563a6668 96b69152ce Author: Nick Mathewson Date: Wed Oct 7 08:38:30 2020 -0400 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.4' into release-0.4.4

2020-10-07 Thread nickm
commit fc563a6668d3ac72207436721bf4ddf8aa0ea084 Merge: e3ba769271 0e2e517019 Author: Nick Mathewson Date: Wed Oct 7 08:35:18 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug34400 | 5 + src/feature/control/control_cmd.c | 2 +- 2 files changed, 6

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

2020-10-07 Thread nickm
commit e3ba769271406ed0e5a3383c7497fec657d0f6b0 Merge: 571253e7ac faac186075 Author: Nick Mathewson Date: Wed Oct 7 08:29:32 2020 -0400 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.4' into release-0.4.4

2020-10-07 Thread nickm
commit 571253e7ac034edb78355a2583b725940dc7bded Merge: 361a4425cf ad62cf2ac9 Author: Nick Mathewson Date: Wed Oct 7 08:26:04 2020 -0400 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.4' into release-0.4.4

2020-10-07 Thread nickm
commit 361a4425cf1e2b7cf72da1d07274039893b3d403 Merge: d455b68909 a44bcc309d Author: Nick Mathewson Date: Wed Oct 7 08:16:20 2020 -0400 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.4' into release-0.4.4

2020-10-07 Thread nickm
commit d455b68909965489ca8a8dc2424d5aa40463919b Merge: 50cb7a5254 c65f4eaf06 Author: Nick Mathewson Date: Wed Oct 7 08:10:08 2020 -0400 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.4' into release-0.4.4

2020-10-07 Thread nickm
commit 50cb7a5254cd5d4e60566aa51eda8bcedb676c3a Merge: ad3cb51b9f 8505dd5e37 Author: Nick Mathewson Date: Wed Oct 7 08:08:02 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40073| 3 +++ src/core/mainloop/connection.c | 9 - 2 files changed, 11

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

2020-10-07 Thread nickm
commit ad3cb51b9fe43bd7d7cda35074b301b4a6a94249 Merge: 128dc38909 30c6b42d34 Author: Nick Mathewson Date: Wed Oct 7 08:05:40 2020 -0400 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.4' into release-0.4.4

2020-10-07 Thread nickm
commit 128dc38909127ab61f9c2c4bccc53cd7757c1ec1 Merge: 7d512cd8b3 7097d1bab9 Author: Nick Mathewson Date: Wed Oct 7 08:03:52 2020 -0400 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.4' into release-0.4.4

2020-10-07 Thread asn
commit 7d512cd8b3142b473e7d4169e76ef99301e98ada Merge: 9c31a8fde3 a914ac5d7c Author: George Kadianakis Date: Wed Oct 7 13:42:57 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40129 | 4 src/feature/dircache/dircache_stub.c | 2 ++

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

2020-10-07 Thread asn
commit 9c31a8fde348073b879489c4ca42c87bc66d357e Merge: 1ebea31036 149b7a2418 Author: George Kadianakis Date: Wed Oct 7 13:29:16 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40113 | 3 +++ src/test/test_connection.c | 13 +++-- 2 files changed, 10

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

2020-09-22 Thread dgoulet
commit 1ebea3103652e4a2e6e4992b637d671b175da1a2 Merge: 0624a01545 b6429430c6 Author: David Goulet Date: Tue Sep 22 13:47:08 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40135 | 3 +++ src/feature/hs_common/shared_random_client.c | 4

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

2020-09-21 Thread nickm
commit 0624a0154501ce6844407548cd34508a03841556 Merge: e780277c4d 1cce0588e1 Author: Nick Mathewson Date: Mon Sep 21 12:59:03 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 .gitlab-ci.yml | 46 ++ scripts/ci/ci-driver.sh | 20

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

2020-09-18 Thread nickm
commit e780277c4dabfeed9e31ded8c8b0381f3b8bf3ec Merge: 453d5c2547 09813fe31e Author: Nick Mathewson Date: Fri Sep 18 19:06:16 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 .gitlab-ci.yml | 27 ++- scripts/ci/ci-driver.sh | 5 + 2 files

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

2020-09-18 Thread dgoulet
commit 453d5c25475ec59ed622b452fa3fe0bff40c9329 Merge: 6c42099f6e 2e3603d96d Author: David Goulet Date: Fri Sep 18 09:45:25 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40126 | 4 src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

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

2020-09-17 Thread nickm
commit 6c42099f6edf1f8e7a8df90262354659110bd3ac Merge: bed245bd1e 54cd2578ef Author: Nick Mathewson Date: Thu Sep 17 13:56:40 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40125 | 4 src/test/test_rendcache.c | 2 ++ 2 files changed, 6 insertions(+)

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

2020-09-15 Thread nickm
commit bed245bd1e77137e566104577f5767ea5fba56e4 Merge: 24e808e946 bf5bf33661 Author: Nick Mathewson Date: Tue Sep 15 08:53:02 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-09-14 Thread nickm
commit 9124845e24e372a8d2a3c9397c4e02dc317fc78c Merge: 94fef11c24 f6b8894726 Author: Nick Mathewson Date: Mon Sep 14 13:18:05 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-09-08 Thread dgoulet
commit 94fef11c24447278726c335e8798f8affde97545 Merge: 6bd94c8a47 85a1e6c601 Author: David Goulet Date: Tue Sep 8 11:14:12 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40117 | 5 + src/feature/rend/rendmid.c | 6 -- 2 files changed, 9

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

2020-08-25 Thread dgoulet
commit 6bd94c8a4780295dd9497a7fac6b5bbb8ebec709 Merge: f50e21b5a7 53cd1c9710 Author: David Goulet Date: Tue Aug 25 08:23:06 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40105| 3 +++ src/feature/client/entrynodes.c | 6 +++--- 2 files changed, 6

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

2020-08-25 Thread asn
commit f50e21b5a7d8366723a9a204784efc86614d3adc Merge: ff99089d41 1397a86bbd Author: George Kadianakis Date: Tue Aug 25 14:51:23 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40109| 6 ++ src/core/or/or_circuit_st.h| 4

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

2020-08-20 Thread asn
commit ff99089d4111c90e0265a6a367942d77714233a8 Merge: c9e4ccf99b 6e37086f85 Author: George Kadianakis Date: Thu Aug 20 14:34:56 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40089 | 4 src/feature/control/control_hs.c | 11 ++

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

2020-08-19 Thread asn
commit c9e4ccf99b2bc639c0f38a7aa7504f9fb00fca88 Merge: 622b0f2fb1 b1b0079675 Author: George Kadianakis Date: Wed Aug 19 13:56:33 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/parallel_unit_test | 4 src/test/include.am| 22 +++---

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

2020-08-18 Thread dgoulet
commit 622b0f2fb1acda3e92853436f2154e1c32a297e3 Merge: 8ca4782340 deea196370 Author: David Goulet Date: Tue Aug 18 08:49:07 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket24308 | 6 ++ src/app/config/config.c | 29 +++--

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

2020-08-13 Thread nickm
commit 8ca478234056e051aed0175a0d3c0b2a9f179fe6 Merge: a7cbbdbbda ef18fb56c9 Author: Nick Mathewson Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40099 | 4 src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

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

2020-08-13 Thread nickm
commit a7cbbdbbdaba3195d658d21dd7ba41cb025250f3 Merge: 8bd79bd75e 26b257757b Author: Nick Mathewson Date: Thu Aug 13 09:44:30 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-08-12 Thread nickm
commit 8bd79bd75e760e7493c2fc7dcf5b38d453ea9f13 Merge: a2e64b3e85 9d77ed7be2 Author: Nick Mathewson Date: Wed Aug 12 20:21:04 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 .gitlab-ci.yml | 34 +- scripts/ci/ci-driver.sh | 34

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

2020-08-12 Thread nickm
commit 1b3c206cf3f88792d6a78fc50b263fc145f910ea Merge: 16d5201af1 f98b1988ec Author: Nick Mathewson Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 .gitlab-ci.yml | 36 --- Makefile.am | 2 ++

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

2020-08-12 Thread nickm
commit 16d5201af151e1f8885a8ad3f415477a31ed72da Merge: 0b1835be92 670f5632a5 Author: Nick Mathewson Date: Wed Aug 12 08:40:27 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 .appveyor.yml | 8 1 file changed, 8 deletions(-)

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

2020-08-12 Thread asn
commit 0b1835be925382d9a508cadb1060e890a39927db Merge: cce39dd915 5a1918d7e7 Author: George Kadianakis Date: Wed Aug 12 13:47:59 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40083 | 5 + src/feature/relay/relay_periodic.c | 5 - 2 files

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

2020-08-12 Thread asn
commit cce39dd915fd6c98468a2565ba67f6cc0c59f4bf Merge: 48cd932ed1 8e9edb93be Author: George Kadianakis Date: Wed Aug 12 13:23:33 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40081| 6 ++ src/core/or/channel.c | 46

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

2020-08-11 Thread nickm
commit 48cd932ed14ca135ffeb91ea4b8b23ad9bb5afe8 Merge: 872d369ce7 1770d1c216 Author: Nick Mathewson Date: Tue Aug 11 17:47:18 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-08-11 Thread nickm
commit 872d369ce7de08304f7eab841c5307173f891ec5 Merge: e3b501c576 d76f8457f3 Author: Nick Mathewson Date: Tue Aug 11 12:40:09 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug34086 | 3 +++ src/feature/hs/hs_client.c | 14 ++ 2 files changed, 13

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

2020-08-11 Thread nickm
commit e3b501c5760adebbe15aa2eaee01abd60e15c538 Merge: 912c8e6a8c 2b968446d9 Author: Nick Mathewson Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++- 2 files

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

2020-08-11 Thread nickm
commit 912c8e6a8cb05c2a2482a73b9bd2b1804d5a56df Merge: 3854123b0b 673d02bdb0 Author: Nick Mathewson Date: Tue Aug 11 11:03:24 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40095 | 4 scripts/ci/ci-driver.sh| 4 ++--

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

2020-08-11 Thread nickm
commit 3854123b0b786acd935edddad32160bbef27e96f Merge: 39882a2021 d83703317d Author: Nick Mathewson Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 .gitlab-ci.yml | 5 + scripts/ci/ci-driver.sh | 5 + 2 files changed, 10 insertions(+)

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

2020-08-11 Thread asn
commit 39882a2021fd907920f027cb204293578ebc6e1b Merge: 16b830ed52 ab9c35f043 Author: George Kadianakis Date: Tue Aug 11 14:54:26 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket6198 | 3 +++ src/core/mainloop/connection.c | 8

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

2020-08-10 Thread nickm
commit 16b830ed52e70e9d1b4e808f88970003fc2a45f6 Merge: 561ba475e9 7d80bf80fe Author: Nick Mathewson Date: Mon Aug 10 19:33:07 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 .gitlab-ci.yml| 120 ++-- scripts/ci/ci-driver.sh | 424

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

2020-08-06 Thread nickm
commit 561ba475e9f2d9d83fd3a70c0ea29a3623dd4865 Merge: e62e46d930 c1b440f760 Author: Nick Mathewson Date: Thu Aug 6 13:24:12 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) ___

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

2020-08-03 Thread asn
commit e62e46d9302ed22d7500c84861c4070cabd67534 Merge: 0f5d594388 18d2c7c5d7 Author: George Kadianakis Date: Mon Aug 3 16:49:04 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket33747| 7 +++ src/core/mainloop/connection.c | 7 ++-

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

2020-07-30 Thread ahf
commit 0f5d5943881da7d7350a01ac3361611f45e796f3 Merge: f04034536f 4c22050de1 Author: Alexander Færøy Date: Fri Jul 31 02:03:35 2020 + Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits

  1   2   >