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
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
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 ++
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(-)
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
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(-)
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(+)
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
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(-)
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
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
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(-)
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
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
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
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 +++
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(-)
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(-)
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
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(+)
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 +-
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
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
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
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
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(-)
26 matches
Mail list logo