commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor
Date: Sat Apr 6 09:33:11 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.4
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit ac28e56ccb402d640f5adde186a765265ce855c7
Merge: 6d057c56f 57e9fe2bb
Author: teor
Date: Mon Apr 1 14:07:58 2019 +1000
Merge branch 'bug29036-029' into bug29036-29962-034
.travis.yml | 8 +---
Makefile.am | 4 +++-
changes/bug29036 | 5 +
3 files changed, 13
commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor
Date: Sat Apr 6 09:28:13 2019 +1000
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
.travis.yml | 8 +---
Makefile.am | 4 +++-
changes/bug29036 | 5 +
3 files
commit 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9
Author: teor
Date: Mon Apr 1 13:49:27 2019 +1000
Makefile: delete all the gcov-related files in reset-gcov
And fix a comment.
See:
https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
---
.travis.yml
commit 0c6cfd9c652e4f5074151320ad31c32cc82818e9
Author: rl1987
Date: Sun Mar 31 16:58:32 2019 +0300
Cleanup cargo registry before each Rust-enabled build
Also, refrain from caching target/.
See: https://levans.fr/rust_travis_cache.html
---
.travis.yml | 5 +++--
1 file
commit 0267c453e2e0d474f742efa1da3ce698ea4af97d
Author: Alexander Færøy
Date: Mon Mar 18 15:27:14 2019 +0100
Run `make reset-gcov` after the script target in Travis CI is done.
This should ensure that GCDA files are never entering the cache of
Travis CI.
See:
commit 102178e6d43ed990e972b2fbc4f611997c8943f0
Merge: 3cfcfbac4 a514e0247
Author: teor
Date: Sat Apr 6 09:30:04 2019 +1000
Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
.travis.yml | 15 +++
Makefile.am | 4 +++-
changes/bug29036| 5
commit a514e024769083908a35f28ac0df5f2e7b1137b8
Merge: 33be8d829 f0cd8f804
Author: teor
Date: Fri Apr 5 12:58:16 2019 +1000
Merge branch 'bug29036-029' into bug29036-29962-034
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 124990aa01c8151fad98a6979e5996d5fbb3f51a
Author: rl1987
Date: Sun Mar 31 17:23:34 2019 +0300
Add changes file
---
changes/ticket29962 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/changes/ticket29962 b/changes/ticket29962
new file mode 100644
index 0..e36cc0cf9
---
commit fbb1c7adfcfbda2f7ed6877beb137c382ecb6b50
Author: Alexander Færøy
Date: Wed Mar 20 15:44:06 2019 +0100
Handle errors from coveralls more gracefully.
Since we have moved coveralls to the script target the entire build will
now fail if coveralls fail. We handle it more
commit 0c6cfd9c652e4f5074151320ad31c32cc82818e9
Author: rl1987
Date: Sun Mar 31 16:58:32 2019 +0300
Cleanup cargo registry before each Rust-enabled build
Also, refrain from caching target/.
See: https://levans.fr/rust_travis_cache.html
---
.travis.yml | 5 +++--
1 file
commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor
Date: Sat Apr 6 09:28:58 2019 +1000
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1
commit 1710f4bbd6bb100901e7f601a1c0f96b51845f86
Author: Nick Mathewson
Date: Thu Apr 4 11:24:55 2019 -0400
Do not cache bogus results from classifying client ciphers
When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache
commit 124990aa01c8151fad98a6979e5996d5fbb3f51a
Author: rl1987
Date: Sun Mar 31 17:23:34 2019 +0300
Add changes file
---
changes/ticket29962 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/changes/ticket29962 b/changes/ticket29962
new file mode 100644
index 0..e36cc0cf9
---
commit 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9
Author: teor
Date: Mon Apr 1 13:49:27 2019 +1000
Makefile: delete all the gcov-related files in reset-gcov
And fix a comment.
See:
https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
---
.travis.yml
commit 7014e57f4a05d2be5486aedd754272c70d365354
Merge: 3280e9a11 33be8d829
Author: teor
Date: Mon Apr 1 14:11:20 2019 +1000
Merge branch 'bug29036-29962-034' into bug29036-29962-035
Merge the moved coverage line from 29036 with the stem changes in
maint-0.3.5.
.travis.yml
commit eb0bd18d6e344c574614d6d53e2f7cead92c3178
Author: teor
Date: Mon Apr 1 13:40:16 2019 +1000
changes: Use the first Tor version with CI coverage for the 29036 changes
file
Otherwise, "make check-changes" will complain when we backport the change.
---
changes/bug29036 | 4
commit 33be8d8295415491fc06bee47729e86d9efcd126
Author: teor
Date: Mon Apr 1 14:05:14 2019 +1000
Travis: merge before_cache from 29036 and 29962
And add some useful comments
---
.travis.yml | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.travis.yml
commit ea5e371822d58eb25eda912ba8afb8c0951b424c
Merge: 44ea34111 db1c1dba3
Author: teor
Date: Sat Apr 6 09:31:52 2019 +1000
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
changes/bug30021 | 8
src/lib/tls/tortls_openssl.c | 2 +-
2 files changed, 9
commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor
Date: Sat Apr 6 09:28:58 2019 +1000
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1
commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748
Merge: 316aed502 48e990359
Author: teor
Date: Sat Apr 6 09:33:20 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit ac28e56ccb402d640f5adde186a765265ce855c7
Merge: 6d057c56f 57e9fe2bb
Author: teor
Date: Mon Apr 1 14:07:58 2019 +1000
Merge branch 'bug29036-029' into bug29036-29962-034
.travis.yml | 8 +---
Makefile.am | 4 +++-
changes/bug29036 | 5 +
3 files changed, 13
commit 8b3b605a1529e34eb42926db7c38d046a3f1bacb
Merge: 071a000d6 3b9e3cca9
Author: teor
Date: Sat Apr 6 09:33:28 2019 +1000
Merge branch 'maint-0.3.5' into maint-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit f0cd8f804f8152355993acf0493b22b668f500b2
Author: teor
Date: Fri Apr 5 12:56:29 2019 +1000
Makefile: actually, don't delete the gcno files
We need to keep the gcno files, because they are created at compile time.
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1
commit db71bceb4048c0274001ee46ebab2c60f8d11259
Merge: 7014e57f4 a514e0247
Author: teor
Date: Fri Apr 5 12:58:32 2019 +1000
Merge branch 'bug29036-29962-034' into bug29036-29962-035
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor
Date: Sat Apr 6 09:28:58 2019 +1000
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1
commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor
Date: Sat Apr 6 09:28:13 2019 +1000
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
.travis.yml | 8 +---
Makefile.am | 4 +++-
changes/bug29036 | 5 +
3 files
commit 2afba291bbfc79198e1cd62382a30168f45db4e5
Merge: b0428b6dc 48e990359
Author: teor
Date: Sat Apr 6 09:33:15 2019 +1000
Merge branch 'maint-0.3.4' into release-0.3.4
.travis.yml | 15 +++
Makefile.am | 4 +++-
changes/bug29036| 5 +
commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748
Merge: 316aed502 48e990359
Author: teor
Date: Sat Apr 6 09:33:20 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit d7fb0cd9377a8c4be91b9af712fa250ea94c2a52
Author: Translation commit bot
Date: Fri Apr 5 21:17:52 2019 +
Update translations for tbmanual-contentspot
---
contents+de.po | 27 +--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git
commit 01c079ac01f20bd91afb3e28dde94fec58061d87
Author: Translation commit bot
Date: Fri Apr 5 21:18:01 2019 +
Update translations for tbmanual-contentspot_completed
---
contents+de.po | 27 +--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git
commit 04c40a43b1b2f6951b8de5a55ea5a4963836ec14
Author: Translation commit bot
Date: Fri Apr 5 21:49:35 2019 +
Update translations for torbutton-browseronboardingproperties
---
da/browserOnboarding.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
commit 8b3b605a1529e34eb42926db7c38d046a3f1bacb
Merge: 071a000d6 3b9e3cca9
Author: teor
Date: Sat Apr 6 09:33:28 2019 +1000
Merge branch 'maint-0.3.5' into maint-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor
Date: Sat Apr 6 09:28:58 2019 +1000
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1
commit db1c1dba34545c9b96f9ec4c01338caeaeeb0433
Merge: 4aa02d3c7 1710f4bbd
Author: Nick Mathewson
Date: Thu Apr 4 11:26:33 2019 -0400
Merge branch 'bug30021_029' into bug30021_035
changes/bug30021 | 8
src/lib/tls/tortls_openssl.c | 2 +-
2 files changed, 9
commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor
Date: Sat Apr 6 09:28:58 2019 +1000
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1
commit 44ea341117ef9f439d7ba9eae74a7a225646bfa3
Merge: 4aa02d3c7 db71bceb4
Author: teor
Date: Sat Apr 6 09:30:52 2019 +1000
Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
.travis.yml | 15 +++
Makefile.am | 4 +++-
changes/bug29036| 5
commit 316aed502e58102fa582ecd9902a3422c27b6dae
Merge: ea5e37182 3fa42d599
Author: teor
Date: Sat Apr 6 09:32:53 2019 +1000
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
.travis.yml | 9 -
changes/bug30011 | 4
2 files changed, 12 insertions(+), 1
commit 102178e6d43ed990e972b2fbc4f611997c8943f0
Merge: 3cfcfbac4 a514e0247
Author: teor
Date: Sat Apr 6 09:30:04 2019 +1000
Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
.travis.yml | 15 +++
Makefile.am | 4 +++-
changes/bug29036| 5
commit 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9
Author: teor
Date: Mon Apr 1 13:49:27 2019 +1000
Makefile: delete all the gcov-related files in reset-gcov
And fix a comment.
See:
https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
---
.travis.yml
commit ea5e371822d58eb25eda912ba8afb8c0951b424c
Merge: 44ea34111 db1c1dba3
Author: teor
Date: Sat Apr 6 09:31:52 2019 +1000
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
changes/bug30021 | 8
src/lib/tls/tortls_openssl.c | 2 +-
2 files changed, 9
commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor
Date: Sat Apr 6 09:28:13 2019 +1000
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
.travis.yml | 8 +---
Makefile.am | 4 +++-
changes/bug29036 | 5 +
3 files
commit 33be8d8295415491fc06bee47729e86d9efcd126
Author: teor
Date: Mon Apr 1 14:05:14 2019 +1000
Travis: merge before_cache from 29036 and 29962
And add some useful comments
---
.travis.yml | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.travis.yml
commit f0cd8f804f8152355993acf0493b22b668f500b2
Author: teor
Date: Fri Apr 5 12:56:29 2019 +1000
Makefile: actually, don't delete the gcno files
We need to keep the gcno files, because they are created at compile time.
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1
commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor
Date: Sat Apr 6 09:33:11 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.4
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit eb0bd18d6e344c574614d6d53e2f7cead92c3178
Author: teor
Date: Mon Apr 1 13:40:16 2019 +1000
changes: Use the first Tor version with CI coverage for the 29036 changes
file
Otherwise, "make check-changes" will complain when we backport the change.
---
changes/bug29036 | 4
commit 0267c453e2e0d474f742efa1da3ce698ea4af97d
Author: Alexander Færøy
Date: Mon Mar 18 15:27:14 2019 +0100
Run `make reset-gcov` after the script target in Travis CI is done.
This should ensure that GCDA files are never entering the cache of
Travis CI.
See:
commit fbb1c7adfcfbda2f7ed6877beb137c382ecb6b50
Author: Alexander Færøy
Date: Wed Mar 20 15:44:06 2019 +0100
Handle errors from coveralls more gracefully.
Since we have moved coveralls to the script target the entire build will
now fail if coveralls fail. We handle it more
commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor
Date: Sat Apr 6 09:28:13 2019 +1000
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
.travis.yml | 8 +---
Makefile.am | 4 +++-
changes/bug29036 | 5 +
3 files
commit eb0bd18d6e344c574614d6d53e2f7cead92c3178
Author: teor
Date: Mon Apr 1 13:40:16 2019 +1000
changes: Use the first Tor version with CI coverage for the 29036 changes
file
Otherwise, "make check-changes" will complain when we backport the change.
---
changes/bug29036 | 4
commit fbb1c7adfcfbda2f7ed6877beb137c382ecb6b50
Author: Alexander Færøy
Date: Wed Mar 20 15:44:06 2019 +0100
Handle errors from coveralls more gracefully.
Since we have moved coveralls to the script target the entire build will
now fail if coveralls fail. We handle it more
commit 1710f4bbd6bb100901e7f601a1c0f96b51845f86
Author: Nick Mathewson
Date: Thu Apr 4 11:24:55 2019 -0400
Do not cache bogus results from classifying client ciphers
When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache
commit f0cd8f804f8152355993acf0493b22b668f500b2
Author: teor
Date: Fri Apr 5 12:56:29 2019 +1000
Makefile: actually, don't delete the gcno files
We need to keep the gcno files, because they are created at compile time.
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1
commit ca0089066bcf3eedd59fd194413d8d4e740eb3e5
Merge: bcac0bb34 a0db5ade3
Author: teor
Date: Sat Apr 6 09:33:06 2019 +1000
Merge branch 'maint-0.2.9' into release-0.2.9
.travis.yml | 8 +---
Makefile.am | 4 +++-
changes/bug29036| 5 +
changes/bug30021| 8
commit 8b3b605a1529e34eb42926db7c38d046a3f1bacb
Merge: 071a000d6 3b9e3cca9
Author: teor
Date: Sat Apr 6 09:33:28 2019 +1000
Merge branch 'maint-0.3.5' into maint-0.4.0
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748
Merge: 316aed502 48e990359
Author: teor
Date: Sat Apr 6 09:33:20 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor
Date: Sat Apr 6 09:33:11 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.4
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit 3fa42d599a205e51c91efb953af70a45e877eafe
Author: teor
Date: Thu Apr 4 13:02:13 2019 +1000
Travis: Terminate test-stem if it takes more than 9.5 minutes to run
(Travis terminates the job after 10 minutes of no output.)
Diagnostic for 29437.
Fixes bug 30011;
commit 0267c453e2e0d474f742efa1da3ce698ea4af97d
Author: Alexander Færøy
Date: Mon Mar 18 15:27:14 2019 +0100
Run `make reset-gcov` after the script target in Travis CI is done.
This should ensure that GCDA files are never entering the cache of
Travis CI.
See:
commit 393f8231c8167b73b3f9339eb01d4c2ed6d96d98
Author: Translation commit bot
Date: Sat Apr 6 00:15:23 2019 +
Update translations for bridgedb_completed
---
uk/LC_MESSAGES/bridgedb.po | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git
commit d7f80a83b611e3d9abb9f05a48a22f32e022c776
Author: Translation commit bot
Date: Sat Apr 6 00:15:15 2019 +
Update translations for bridgedb
---
uk/LC_MESSAGES/bridgedb.po | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/uk/LC_MESSAGES/bridgedb.po
commit dfd9987e017741be678fc6f1fdda1368aeafd4f0
Author: Translation commit bot
Date: Sat Apr 6 00:50:35 2019 +
Update translations for tpo-web
---
contents+pt-BR.po | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/contents+pt-BR.po b/contents+pt-BR.po
commit 349db56422c61c4495ceea2235dd6df93ec9d3bb
Author: Translation commit bot
Date: Sat Apr 6 00:50:41 2019 +
Update translations for tpo-web_completed
---
contents+pt-BR.po | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/contents+pt-BR.po
commit 0237c0d1a0054ddea1b39c07ecfd4aefd57e
Author: Translation commit bot
Date: Fri Apr 5 22:20:30 2019 +
Update translations for tpo-web
---
contents+fr.po | 27 +++
1 file changed, 27 insertions(+)
diff --git a/contents+fr.po b/contents+fr.po
index
commit ea5e371822d58eb25eda912ba8afb8c0951b424c
Merge: 44ea34111 db1c1dba3
Author: teor
Date: Sat Apr 6 09:31:52 2019 +1000
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
changes/bug30021 | 8
src/lib/tls/tortls_openssl.c | 2 +-
2 files changed, 9
commit f0cd8f804f8152355993acf0493b22b668f500b2
Author: teor
Date: Fri Apr 5 12:56:29 2019 +1000
Makefile: actually, don't delete the gcno files
We need to keep the gcno files, because they are created at compile time.
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1
commit a514e024769083908a35f28ac0df5f2e7b1137b8
Merge: 33be8d829 f0cd8f804
Author: teor
Date: Fri Apr 5 12:58:16 2019 +1000
Merge branch 'bug29036-029' into bug29036-29962-034
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1710f4bbd6bb100901e7f601a1c0f96b51845f86
Author: Nick Mathewson
Date: Thu Apr 4 11:24:55 2019 -0400
Do not cache bogus results from classifying client ciphers
When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache
commit db1c1dba34545c9b96f9ec4c01338caeaeeb0433
Merge: 4aa02d3c7 1710f4bbd
Author: Nick Mathewson
Date: Thu Apr 4 11:26:33 2019 -0400
Merge branch 'bug30021_029' into bug30021_035
changes/bug30021 | 8
src/lib/tls/tortls_openssl.c | 2 +-
2 files changed, 9
commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748
Merge: 316aed502 48e990359
Author: teor
Date: Sat Apr 6 09:33:20 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor
Date: Sat Apr 6 09:28:58 2019 +1000
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1
commit db1c1dba34545c9b96f9ec4c01338caeaeeb0433
Merge: 4aa02d3c7 1710f4bbd
Author: Nick Mathewson
Date: Thu Apr 4 11:26:33 2019 -0400
Merge branch 'bug30021_029' into bug30021_035
changes/bug30021 | 8
src/lib/tls/tortls_openssl.c | 2 +-
2 files changed, 9
commit 316aed502e58102fa582ecd9902a3422c27b6dae
Merge: ea5e37182 3fa42d599
Author: teor
Date: Sat Apr 6 09:32:53 2019 +1000
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
.travis.yml | 9 -
changes/bug30011 | 4
2 files changed, 12 insertions(+), 1
commit 102178e6d43ed990e972b2fbc4f611997c8943f0
Merge: 3cfcfbac4 a514e0247
Author: teor
Date: Sat Apr 6 09:30:04 2019 +1000
Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
.travis.yml | 15 +++
Makefile.am | 4 +++-
changes/bug29036| 5
commit 102178e6d43ed990e972b2fbc4f611997c8943f0
Merge: 3cfcfbac4 a514e0247
Author: teor
Date: Sat Apr 6 09:30:04 2019 +1000
Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
.travis.yml | 15 +++
Makefile.am | 4 +++-
changes/bug29036| 5
commit 44ea341117ef9f439d7ba9eae74a7a225646bfa3
Merge: 4aa02d3c7 db71bceb4
Author: teor
Date: Sat Apr 6 09:30:52 2019 +1000
Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
.travis.yml | 15 +++
Makefile.am | 4 +++-
changes/bug29036| 5
commit 44ea341117ef9f439d7ba9eae74a7a225646bfa3
Merge: 4aa02d3c7 db71bceb4
Author: teor
Date: Sat Apr 6 09:30:52 2019 +1000
Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
.travis.yml | 15 +++
Makefile.am | 4 +++-
changes/bug29036| 5
commit 071a000d67577a950b6a4404c3cf35bd90de3654
Merge: 2cc3c98bc da678213e
Author: George Kadianakis
Date: Fri Apr 5 16:44:59 2019 +0300
Merge branch 'tor-github/pr/906' into maint-0.4.0
changes/bug29500 | 3 +
src/core/or/circuitpadding.c | 3 +-
commit 7014e57f4a05d2be5486aedd754272c70d365354
Merge: 3280e9a11 33be8d829
Author: teor
Date: Mon Apr 1 14:11:20 2019 +1000
Merge branch 'bug29036-29962-034' into bug29036-29962-035
Merge the moved coverage line from 29036 with the stem changes in
maint-0.3.5.
.travis.yml
commit 316aed502e58102fa582ecd9902a3422c27b6dae
Merge: ea5e37182 3fa42d599
Author: teor
Date: Sat Apr 6 09:32:53 2019 +1000
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
.travis.yml | 9 -
changes/bug30011 | 4
2 files changed, 12 insertions(+), 1
commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor
Date: Sat Apr 6 09:33:11 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.4
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor
Date: Sat Apr 6 09:28:13 2019 +1000
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
.travis.yml | 8 +---
Makefile.am | 4 +++-
changes/bug29036 | 5 +
3 files
commit db71bceb4048c0274001ee46ebab2c60f8d11259
Merge: 7014e57f4 a514e0247
Author: teor
Date: Fri Apr 5 12:58:32 2019 +1000
Merge branch 'bug29036-29962-034' into bug29036-29962-035
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 0267c453e2e0d474f742efa1da3ce698ea4af97d
Author: Alexander Færøy
Date: Mon Mar 18 15:27:14 2019 +0100
Run `make reset-gcov` after the script target in Travis CI is done.
This should ensure that GCDA files are never entering the cache of
Travis CI.
See:
commit 3fa42d599a205e51c91efb953af70a45e877eafe
Author: teor
Date: Thu Apr 4 13:02:13 2019 +1000
Travis: Terminate test-stem if it takes more than 9.5 minutes to run
(Travis terminates the job after 10 minutes of no output.)
Diagnostic for 29437.
Fixes bug 30011;
commit 0c6cfd9c652e4f5074151320ad31c32cc82818e9
Author: rl1987
Date: Sun Mar 31 16:58:32 2019 +0300
Cleanup cargo registry before each Rust-enabled build
Also, refrain from caching target/.
See: https://levans.fr/rust_travis_cache.html
---
.travis.yml | 5 +++--
1 file
commit 33be8d8295415491fc06bee47729e86d9efcd126
Author: teor
Date: Mon Apr 1 14:05:14 2019 +1000
Travis: merge before_cache from 29036 and 29962
And add some useful comments
---
.travis.yml | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.travis.yml
commit fbb1c7adfcfbda2f7ed6877beb137c382ecb6b50
Author: Alexander Færøy
Date: Wed Mar 20 15:44:06 2019 +0100
Handle errors from coveralls more gracefully.
Since we have moved coveralls to the script target the entire build will
now fail if coveralls fail. We handle it more
commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor
Date: Sat Apr 6 09:28:13 2019 +1000
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
.travis.yml | 8 +---
Makefile.am | 4 +++-
changes/bug29036 | 5 +
3 files
commit ac28e56ccb402d640f5adde186a765265ce855c7
Merge: 6d057c56f 57e9fe2bb
Author: teor
Date: Mon Apr 1 14:07:58 2019 +1000
Merge branch 'bug29036-029' into bug29036-29962-034
.travis.yml | 8 +---
Makefile.am | 4 +++-
changes/bug29036 | 5 +
3 files changed, 13
commit 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9
Author: teor
Date: Mon Apr 1 13:49:27 2019 +1000
Makefile: delete all the gcov-related files in reset-gcov
And fix a comment.
See:
https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
---
.travis.yml
commit 124990aa01c8151fad98a6979e5996d5fbb3f51a
Author: rl1987
Date: Sun Mar 31 17:23:34 2019 +0300
Add changes file
---
changes/ticket29962 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/changes/ticket29962 b/changes/ticket29962
new file mode 100644
index 0..e36cc0cf9
---
commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor
Date: Sat Apr 6 09:28:13 2019 +1000
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
.travis.yml | 8 +---
Makefile.am | 4 +++-
changes/bug29036 | 5 +
3 files
commit ea5e371822d58eb25eda912ba8afb8c0951b424c
Merge: 44ea34111 db1c1dba3
Author: teor
Date: Sat Apr 6 09:31:52 2019 +1000
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
changes/bug30021 | 8
src/lib/tls/tortls_openssl.c | 2 +-
2 files changed, 9
commit f213a35b2f7e14b14f4d23dd2084190050d3ca32
Merge: f021ca2d5 8b3b605a1
Author: teor
Date: Sat Apr 6 09:33:38 2019 +1000
Merge branch 'maint-0.4.0'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748
Merge: 316aed502 48e990359
Author: teor
Date: Sat Apr 6 09:33:20 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor
Date: Sat Apr 6 09:33:11 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.4
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor
Date: Sat Apr 6 09:28:58 2019 +1000
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
changes/bug30021| 8
src/common/tortls.c | 2 +-
2 files changed, 9 insertions(+), 1
commit 393259eddae82abac859f6edd211767ddc629854
Author: Translation commit bot
Date: Sat Apr 6 00:49:42 2019 +
Update translations for torbutton-browseronboardingproperties_completed
---
pt-BR/browserOnboarding.properties | 12
1 file changed, 12 insertions(+)
diff --git
commit 88d2cc4a81b2ff28b0dae2ee0aa075e1af572f25
Author: Translation commit bot
Date: Sat Apr 6 00:49:34 2019 +
Update translations for torbutton-browseronboardingproperties
---
pt-BR/browserOnboarding.properties | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff
201 - 300 of 315 matches
Mail list logo