commit 5b345c693e73ad636a3dce9ca1e8622e1df8ed26
Merge: feecf46e6d 45d9830493
Author: Nick Mathewson
Date: Thu Aug 13 14:20:39 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug40099 | 4
src/test/test_rendcache.c | 2 +-
2 files changed, 5 insertions(+), 1
commit feecf46e6deca4493c46b53e84872a76fff67b80
Merge: b6fb925e99 07f0210a05
Author: Nick Mathewson
Date: Wed Aug 12 20:21:04 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.gitlab-ci.yml | 34 +-
scripts/ci/ci-driver.sh | 34
commit b6fb925e99945b40573a96e469117ed2bf9e884f
Merge: 6753b804e4 02bb719a94
Author: Nick Mathewson
Date: Wed Aug 12 12:29:17 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.gitlab-ci.yml | 36 ---
Makefile.am | 2 ++
commit 6753b804e4a0cc00ed511992a5edc2b8c641c166
Merge: c9c9aebedf 6ef40144ae
Author: Nick Mathewson
Date: Wed Aug 12 08:39:41 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.appveyor.yml | 8
1 file changed, 8 deletions(-)
commit c9c9aebedfff311e28acec90531413d35fb4c548
Merge: e9741a490e c6c0af403c
Author: Nick Mathewson
Date: Tue Aug 11 12:37:08 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.gitlab-ci.yml | 5 +++--
scripts/ci/ci-driver.sh | 27 ++-
2 files
commit e9741a490edca134674d55f72cdcc6ff3ed64627
Merge: f06e08e4d6 da8577bb75
Author: Nick Mathewson
Date: Tue Aug 11 11:03:24 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
scripts/ci/ci-driver.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit f06e08e4d69132279c1151aeecb5fc8fa0b70205
Merge: 28bbe09b80 e4a6d9d5a9
Author: Nick Mathewson
Date: Tue Aug 11 10:44:40 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.gitlab-ci.yml | 5 +
scripts/ci/ci-driver.sh | 5 +
2 files changed, 10 insertions(+)
commit 28bbe09b80cc0c18f71a51603469bf211bfe2a12
Merge: 1f54007161 68f8250cbb
Author: Nick Mathewson
Date: Mon Aug 10 19:33:06 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.gitlab-ci.yml| 120 ++--
scripts/ci/ci-driver.sh | 424
commit 1f54007161cc8d315e7733d5d8cb2699d9f849fd
Merge: 529b989675 352991c843
Author: Nick Mathewson
Date: Thu Aug 6 13:24:11 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.gitlab-ci.yml | 32 ++--
1 file changed, 2 insertions(+), 30 deletions(-)
commit 529b98967538b0a942ded2e4739591c9fe01d8e1
Merge: 5f4601f5aa 4e684c8695
Author: Alexander Færøy
Date: Fri Jul 31 02:03:34 2020 +
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug40076| 5
src/lib/buf/buffers.c | 2 ++
src/test/test_buffers.c | 64
commit 5f4601f5aa388f25c63faf9822f7dfcfab09f34c
Merge: 061fcce5d5 cdb0e6c252
Author: Nick Mathewson
Date: Wed Jul 29 12:37:07 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug31036| 3 +++
src/lib/fdio/fdio.c | 6 +++---
2 files changed, 6 insertions(+), 3
commit 061fcce5d5741c1f86ef40c6c79c073784ce7875
Merge: 56e5b0b2b6 c0bc30b6f0
Author: Nick Mathewson
Date: Mon Jul 27 12:56:18 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
src/app/config/fallback_dirs.inc | 15 ---
1 file changed, 15 deletions(-)
commit 56e5b0b2b6d546df522a9e3d9756ee4a8af72976
Merge: f9e5362ade 3bcbd69a77
Author: Nick Mathewson
Date: Thu Jul 23 10:09:14 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket40061 | 5 +
src/app/config/fallback_dirs.inc | 503
commit f9e5362ade10666fc6ee8ae9e2a9e7c25c6e3c73
Merge: f94575126 49b4d1765
Author: Nick Mathewson
Date: Thu Jul 9 13:15:59 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit f945751265a140654fdc1a3e900db9affd60ae69
Merge: d3536911e 5aaecf6d0
Author: Nick Mathewson
Date: Thu Jul 9 10:32:39 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit c2e49a01151fd7a765408081a5067c7a3eee6b99
Merge: bd7174bb9 283ce30c5
Author: Nick Mathewson
Date: Thu Jul 9 09:28:53 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug33119 | 4 +++
src/lib/tls/tortls_nss.c | 47 +++
commit bd7174bb98af05f05d3220f12e8aec9cd68b3e1a
Merge: be3baeb87 b81e24cda
Author: Alexander Færøy
Date: Wed Jul 8 00:36:48 2020 +
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug40028 | 3 +++
src/lib/tls/x509.c | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
commit be3baeb879387154ec5eae0cf9487ff1e489f4d3
Merge: 0e10a162b 19d579e8c
Author: Alexander Færøy
Date: Tue Jul 7 14:48:36 2020 +
Merge branch 'maint-0.4.2' into release-0.4.2
.appveyor.yml | 2 +-
changes/ticket40026 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
commit 1a50657e83e8c4f441f081a0c25d85d23a9d5630
Merge: 7d833ee33 07d8d398c
Author: David Goulet
Date: Thu Jul 2 07:20:57 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug16016 | 4
src/feature/nodelist/routerlist.c | 6 +-
2 files changed, 9
commit 7d833ee33458d93adaeeccbb88cce98738a96f6a
Merge: 511e1cfde dbb70d85b
Author: Alexander Færøy
Date: Tue Jun 30 14:23:41 2020 +
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug34303| 5 +
src/core/or/circuitlist.c | 2 +-
commit 511e1cfde4152b3ad40cbc4ec6880f9035c5a3b9
Merge: 1b106cded 881f50a9a
Author: Alexander Færøy
Date: Tue Jun 30 14:16:16 2020 +
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket33623 | 2 ++
src/core/or/sendme.h | 2 +-
2 files changed, 3 insertions(+), 1
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 |
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
commit c10323faae87f8e928566edc10a7be62fe7bb51b
Merge: ec2bc07f4 b0bfee8c7
Author: Alexander Færøy
Date: Tue Jun 30 13:37:20 2020 +
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug32884 | 5 +
src/lib/thread/compat_pthreads.c | 2 +-
2 files changed, 6
commit ec2bc07f420ea3c76222583f2275941818b99257
Merge: 5668287fe d235e523d
Author: Nick Mathewson
Date: Mon Jun 29 13:57:50 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket33290 | 4
src/core/or/circuitmux.c | 8 ++--
commit 5668287fe74122c61eaa2178a97737d671109655
Merge: 64b8ee3f9 a692b87f8
Author: Nick Mathewson
Date: Mon Jun 29 13:53:39 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug33104 | 4
src/feature/control/control.c| 4
commit 64b8ee3f9e0f2c70444f2aee0acf1433a791d82d
Merge: 57390b76b 0575a182a
Author: Nick Mathewson
Date: Mon Jun 29 13:48:32 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug33095_041 | 5 +
src/lib/log/util_bug.h | 2 +-
2 files changed, 6 insertions(+), 1
commit 57390b76bf0a4dea8254f53df734cb1427ed3006
Merge: 51b4a4bd1 216456299
Author: Nick Mathewson
Date: Mon Jun 29 12:58:50 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug33087 | 4
src/lib/err/torerr.c | 31 ++-
commit 51b4a4bd1c0114a95336afc96d4208101872dba9
Merge: fadea75ad fd8ce812b
Author: Nick Mathewson
Date: Mon Jun 29 12:55:35 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket28992| 3 +++
src/feature/hs/hs_client.c | 11 ---
2 files changed, 11
commit fadea75adaac5e9d760e996bb5e71df53daf17f9
Merge: 6eee995cc 0f218a05a
Author: David Goulet
Date: Fri Jun 12 12:55:41 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.travis.yml | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
commit 6eee995cc9bbe672c954222b41b6ec28da5a3d14
Merge: d63eeb1b6 193082895
Author: Nick Mathewson
Date: Fri Jun 5 12:37:29 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.appveyor.yml | 2 ++
1 file changed, 2 insertions(+)
___
commit d63eeb1b69fcc971f3a789eab72cf7c02905067b
Merge: 2a9ffeb47 e75583e71
Author: Nick Mathewson
Date: Fri May 15 10:25:27 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2a9ffeb4753f1f13c1428223ae6c206c70d169d9
Merge: ab92fd590 b8bff426f
Author: Nick Mathewson
Date: Thu May 14 10:20:08 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.travis.yml | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
commit 6b0839215207127b912c9e3a5753ca6ad1dff5d1
Merge: c2d002c63 d46f67ef0
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug34078 | 5
src/core/or/channeltls.c | 2 +-
commit ab92fd5907c9d8fed647d22cb923a9175a28ba33
Merge: 6b0839215 b16c1e4cf
Author: Nick Mathewson
Date: Wed May 6 17:18:46 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
commit c2d002c63337fa774e3ed19e9585a9f699f47850
Merge: 21180862e d04b708b4
Author: Nick Mathewson
Date: Wed May 6 16:47:03 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac | 16
src/core/proto/proto_socks.c | 5
commit 21180862e07d38ed03a5f13b1f51ee13dacd40ef
Merge: 71e72ce9c bbfc498e2
Author: Nick Mathewson
Date: Mon May 4 10:25:52 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug34077 | 3 +++
src/feature/dirauth/shared_random_state.c | 3 ++-
2
commit 71e72ce9caa5e7ed07f475a8ed1b40fce46c86d5
Merge: 958f6eb5c 2d34d4d1a
Author: teor
Date: Thu Apr 9 19:43:24 2020 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
___
commit 958f6eb5c7b0f85197959970bd6bab5a54ecc30d
Merge: c22601765 2d7e08d57
Author: teor
Date: Thu Apr 9 11:03:30 2020 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket33491 | 6 ++
src/core/or/channel.c | 2 +-
src/core/or/dos.c | 4 ++--
src/core/or/dos.h
commit c22601765d7b5fcf833a04db3784b2620ffd77e0
Merge: aed3a3f79 048714d2c
Author: Nick Mathewson
Date: Wed Mar 25 10:56:27 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.appveyor.yml| 16 ++--
changes/bug33673 | 6 ++
2 files changed, 20 insertions(+), 2
commit aed3a3f7955ee83c6aae92843619baaaeb201cfa
Merge: 96a8773f0 3aa855dc6
Author: teor
Date: Fri Mar 20 11:24:54 2020 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
.appveyor.yml | 2 +-
changes/ticket33643 | 5 +
changes/ticket33643_part2 | 3 +++
commit 96a8773f0d0da751e58b5460b23adf26006c2618
Merge: 74cad1469 190cda0e2
Author: Nick Mathewson
Date: Wed Mar 18 12:18:31 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit a74f620e5281194566bf30a656ddd2f6952656c9
Merge: 40536768b 85141a3a7
Author: Nick Mathewson
Date: Tue Mar 17 15:22:36 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket33119| 8 +
src/feature/dirparse/parsecommon.c | 9 -
commit e1e095b87023f7f40157263f8273419a730cb607
Merge: 8efddd8b0 758deaa47
Author: Nick Mathewson
Date: Wed Mar 18 08:20:16 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++
1 file changed, 7 insertions(+)
commit 9bdcfe51e28e4f522173f21da34283d5f1ba728c
Merge: 0d2dcc15c 4ee269941
Author: Nick Mathewson
Date: Tue Mar 17 13:56:10 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket33619 | 5 +
src/core/or/circuitpadding.c | 9 ++---
2 files changed, 11
commit 0d2dcc15c079520d77458347c57622f4498008db
Merge: 015d5152f e15a621ac
Author: Nick Mathewson
Date: Tue Mar 17 11:45:16 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/trove_2020_003 | 4
src/feature/hs/hs_client.c | 6 +++---
commit 015d5152fa78c5f1dda3953214d56893e8a3d111
Merge: 58378c27e 9ef8f5d1b
Author: teor
Date: Mon Mar 16 20:54:30 2020 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
.travis.yml | 2 +-
changes/ticket32792 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
commit 58378c27ea59c101d47a5a16a64bddee686e75f1
Merge: aca4d1524 2f4fa423c
Author: Nick Mathewson
Date: Fri Mar 13 16:57:42 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit aca4d1524e28f31355108b9824893ea561e7609f
Merge: 952ab81b5 6ed2c9e5f
Author: Nick Mathewson
Date: Fri Mar 13 16:46:16 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug33093_logging | 5 +
src/lib/tls/buffers_tls.c | 4 ++--
2 files changed, 7 insertions(+),
commit 952ab81b5a0340896c8b8965ced20cd001ab
Merge: 5cafb3364 b50494233
Author: Nick Mathewson
Date: Fri Mar 13 16:45:26 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket33029 | 5 +
doc/tor.1.txt | 7 ++
src/app/config/config.c
commit 5cafb3364f739ceafcd5abeac93c38763b76d6ec
Merge: 557bc747f f021389e9
Author: teor
Date: Fri Mar 13 13:01:22 2020 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
.travis.yml | 57 -
changes/ticket33194 | 4
commit 557bc747f3ef7d3e07965c31343f71143d0a9770
Merge: d006cb25b ff5220536
Author: teor
Date: Wed Feb 12 12:22:08 2020 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
.travis.yml| 2 --
changes/bug32753 | 3 +++
changes/ticket33075| 4
commit d006cb25bd86f1acfbd8ac5626723b53a16ef43a
Merge: f8ff2f12d 00fe21472
Author: Nick Mathewson
Date: Tue Feb 11 08:53:41 2020 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit f8ff2f12d48ede0186f4c921d773bc51d82128e1
Merge: b8bfea163 0c90fc37e
Author: Nick Mathewson
Date: Mon Feb 10 14:17:10 2020 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket33212 | 4
src/rust/protover/protover.rs | 2 +-
2 files changed, 5
commit b8bfea163967289749369a3acb1f4f41dbf513ed
Merge: 971a6beff c5e610af0
Author: Nick Mathewson
Date: Thu Jan 30 11:19:55 2020 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 8b03ae1e57dee88124f5660faabd0995deff0fe0
Merge: 924d1ebb3 f470b863a
Author: Nick Mathewson
Date: Wed Jan 29 19:44:48 2020 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 924d1ebb384f9a586e3b8fbf6eed12bf55db77f2
Merge: 3bfbeff80 7b6be02a9
Author: teor
Date: Thu Jan 30 07:55:16 2020 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug29819 | 8
changes/bug32778 | 3 +++
src/app/main/main.c | 4 ++--
commit 3bfbeff80db8d15dc47744fd49ad826b014a7b91
Merge: afa4cc57b 48187248d
Author: teor
Date: Thu Jan 16 10:00:51 2020 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit afa4cc57bf101eb3effbd233fc3d18265279fe8e
Merge: f1173a63f 7e111d0ea
Author: teor
Date: Tue Jan 14 17:41:40 2020 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket32705_disable | 7 +++
scripts/maint/practracker/practracker.py | 2 ++
commit f1173a63fb905922a2ef13588a1999d85a24a9f6
Merge: 77188ef36 6da989cfe
Author: Nick Mathewson
Date: Mon Jan 6 13:24:01 2020 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug32771| 4
changes/ticket32765 | 4
src/lib/confmgt/structvar.c | 4
commit 77188ef36e9163b87f89135ff459f21100614b1e
Merge: 7b7aa4f07 2d8d6d1eb
Author: Nick Mathewson
Date: Mon Jan 6 08:08:59 2020 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug32841 | 4
changes/bug32877 | 4
2 files changed, 4 insertions(+), 4 deletions(-)
commit 7b7aa4f070565fda111991f0d49342c977e42f02
Merge: 664a2c075 16e94dc7a
Author: Nick Mathewson
Date: Mon Jan 6 08:06:54 2020 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug32877 | 4
src/lib/sandbox/sandbox.c | 1 +
2 files changed, 5 insertions(+)
commit 664a2c0755156bce2947338bf08edc1f02326e1d
Merge: d5702a634 5dbb607e9
Author: teor
Date: Fri Dec 20 10:12:55 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
.travis.yml | 10 --
changes/ticket32240 | 4
changes/ticket32242 | 2 ++
3 files changed, 10
commit d5702a6340104434fe1d82a340c74b2393a1f8aa
Merge: ee4375a98 bd11fb109
Author: teor
Date: Mon Dec 16 08:16:24 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
.travis.yml | 9 +
changes/ticket32629 | 4
2 files changed, 9 insertions(+), 4 deletions(-)
commit ee4375a98545aa12acc511ccde21de7a0af56043
Merge: bede4ea10 b7d18f861
Author: Nick Mathewson
Date: Mon Dec 9 16:04:22 2019 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 8646b4dde78a7e7d82de1cefc134b3f9f921624d
Merge: cb51b0d55 3248630fc
Author: Nick Mathewson
Date: Fri Dec 6 16:02:08 2019 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
changes/geoip-2019-12-03 | 4 +
src/config/geoip | 13933
commit cb51b0d55eea5802ca0917417055392d3c71ef35
Merge: 9b2d87029 0a33522b6
Author: Nick Mathewson
Date: Thu Dec 5 13:33:05 2019 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 24e6251b81794b66800fa208c6699808b9a079b0
Merge: df9a1f313 bb786797a
Author: teor
Date: Thu Dec 5 10:14:12 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit df9a1f313799403b813c5645bf5554ee16233517
Merge: 189287e7b 3207a8e5c
Author: teor
Date: Tue Dec 3 12:47:02 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
.travis.yml | 14 +-
changes/ticket32500 | 5 +
2 files changed, 14 insertions(+), 5
commit 189287e7bc3c4cb5080c4b6c177121c6e69569f3
Merge: aa73b30df eb8170408
Author: teor
Date: Mon Nov 25 12:50:59 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
doc/HACKING/CodingStandards.md | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit aa73b30dfac927c565f553e93685e3c3dd4a2118
Merge: 7f43d24e0 3d6545250
Author: teor
Date: Mon Nov 25 12:37:21 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
doc/HACKING/CodingStandards.md | 29 ++---
1 file changed, 18 insertions(+), 11 deletions(-)
commit 7f43d24e077fa36ae3d488ad8173db572a10caad
Merge: 6a490d303 6d81ca845
Author: Nick Mathewson
Date: Fri Nov 15 08:06:50 2019 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 9eef1d680cec9c87170aeebca023349eea55a0d3
Merge: 0cfb7f6ce 70755eca0
Author: Nick Mathewson
Date: Tue Nov 12 16:40:00 2019 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 0cfb7f6ce715d1947029c7dd92e6fd79868dc599
Merge: 111f988b5 9be51e8a8
Author: teor
Date: Tue Nov 12 10:09:57 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug32295 | 3 ++
src/lib/confmgt/type_defs.c| 39 +++--
commit 111f988b5c586ce34a1e482561a988f4794ea6e8
Merge: 253a45115 a920597f6
Author: Nick Mathewson
Date: Mon Nov 11 10:14:04 2019 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
changes/geoip-2019-11-06 | 4 +
src/config/geoip | 15751
commit 253a45115ef7908804f58df1020c6a6f46b3affa
Merge: 7a4069911 8b1f99c29
Author: teor
Date: Mon Nov 11 14:19:59 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
.appveyor.yml| 2 +-
changes/bug32449 | 5 +
2 files changed, 6 insertions(+), 1 deletion(-)
commit 7a4069911d427391455e8b75597b504dc478da5c
Merge: 634fdf86f 1f3bf10d3
Author: teor
Date: Thu Nov 7 10:51:43 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket32407 | 4
src/core/mainloop/mainloop.c | 4
commit 634fdf86ffe32a83b3a509e47ccc3d4f83085285
Merge: 3d7433cd9 8f6dc54e3
Author: Nick Mathewson
Date: Wed Nov 6 08:57:21 2019 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket32191 | 3 +++
configure.ac| 5 +
2 files changed, 8 insertions(+)
commit 3d7433cd97d334859d202ce259ae32bc025cc9a7
Merge: cf56693f1 c3a1e15a5
Author: teor
Date: Wed Nov 6 21:30:39 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug32402 | 3 +++
changes/bug32402_git_scripts | 3 +++
commit cf56693f1cfd7174f41fc6a546a6c3f83a6e58e4
Merge: 3edd4842e 10ef7a31c
Author: teor
Date: Wed Nov 6 17:04:48 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
Makefile.am | 2 +-
changes/bug31335 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
commit 3edd4842e38e925677bbd8911f0bdd0f9ab41bb0
Merge: dbae58d58 76fd872db
Author: teor
Date: Wed Nov 6 11:19:58 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit dbae58d58001b8404aa805512065d123f2d6ee1a
Merge: 8f8e1523e 2395800d3
Author: teor
Date: Tue Oct 29 08:26:59 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
.travis.yml | 7 ---
changes/ticket32241 | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
commit 8f8e1523e0cdf00570edcaa51f4c8564f263202e
Merge: 446912854 d7c40beea
Author: teor
Date: Fri Oct 25 10:56:17 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
.travis.yml| 12 ++--
changes/ticket31919_bionic | 5 +
2 files changed, 15
commit 44691285452f0220813e30f01f86e4496d3fd601
Merge: 84e9060f4 c8aa3cc17
Author: teor
Date: Fri Oct 25 10:38:18 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket31958 | 5 +
src/feature/dircache/dircache.c | 10 --
commit 84e9060f4de1889fba8be99cff7e5bc05911a58f
Merge: e73fb5b0e acd27f4b4
Author: teor
Date: Fri Oct 25 09:42:10 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket28970| 6 ++
src/feature/hs/hs_client.c | 8 ++--
2 files changed, 12 insertions(+), 2
commit e73fb5b0e9f3c5568bcfd821051d6ccdddf41d87
Merge: 80bfc4719 570d1367e
Author: Nick Mathewson
Date: Thu Oct 24 15:55:51 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit bb54bca8759d2c5f6b3f22ba57b7ef22f189e1e4
Merge: a1b8ff682 76939cf29
Author: Nick Mathewson
Date: Wed Oct 23 20:26:32 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit a822bf291e258818fdc4ce94059b105cd733a3ee
Merge: 53c4068e8 65545e134
Author: teor
Date: Wed Oct 23 10:00:45 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit 53c4068e80e20e0e7d57639108bb1bf4ad1bc983
Merge: 443df7e0d b45048fea
Author: teor
Date: Wed Oct 23 08:47:27 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug32106 | 5 +
doc/tor.1.txt| 21 +
2 files changed, 18 insertions(+), 8
commit 443df7e0d25710036c4cc821954cfd92386419a3
Merge: 869e15cbf 2ed194c9a
Author: Nick Mathewson
Date: Tue Oct 22 14:47:28 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug32108 | 8
src/core/mainloop/mainloop.c | 2 +-
2 files changed, 9
commit 869e15cbf49417f2c6774bec49da9d91dc133905
Merge: fb610c9a2 edc3f7063
Author: Nick Mathewson
Date: Tue Oct 22 12:54:44 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit fb610c9a23b37428c6211965f600a893b02cc395
Merge: 796f1d8b7 5ddc04f49
Author: Nick Mathewson
Date: Tue Oct 22 12:53:12 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 796f1d8b751ad0c05b3d763f9d8cef43cd39cac2
Merge: 24d8b931d 730f0e3da
Author: Nick Mathewson
Date: Tue Oct 22 12:51:33 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 2d8b4f9c4896ed332e0918d75dd32bbc2380e66a
Merge: 6f3ee65f5 c55c75bc9
Author: Nick Mathewson
Date: Tue Oct 22 12:13:56 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 24d8b931d0c003ef65317fbe01a9c40aa9c13323
Merge: 2d8b4f9c4 9537966a0
Author: Nick Mathewson
Date: Tue Oct 22 12:15:14 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 6f3ee65f5340b47ebb6e215e5cc1dbd6e013778b
Merge: 11b1e1715 34f3d8d40
Author: Nick Mathewson
Date: Tue Oct 22 12:11:59 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 11b1e1715e3af3c39a4e32e3256acf137638849a
Merge: 25a9eab04 e5b9eefb0
Author: Nick Mathewson
Date: Tue Oct 22 12:10:30 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 25a9eab04c0a58072e7c306da4c4cb108f12afae
Merge: 05f91b5d7 cbc67241d
Author: Nick Mathewson
Date: Tue Oct 22 12:08:53 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 0403a2f359d0c03b9f240df234eb0a1503294830
Merge: f20e61020 f98b59524
Author: teor
Date: Tue Oct 22 20:48:23 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2
.travis.yml | 12 +++-
changes/ticket32177 | 3 +++
2 files changed, 10 insertions(+), 5
commit f20e6102016df70db4d5f8d2d821457b881e3697
Merge: faecdace8 7a35c8d8b
Author: Nick Mathewson
Date: Mon Oct 21 18:44:44 2019 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
.appveyor.yml | 8
changes/ticket32086 | 3 +++
2 files changed, 7 insertions(+), 4
1 - 100 of 108 matches
Mail list logo
