commit 1954f86427ae1aabece5e2bafa39ac0c00f357b2
Author: Translation commit bot
Date: Thu May 7 03:23:29 2020 +
https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
contents+zh-CN.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
commit 77499b5b3b6ac03be5a5c3f2f33246ba6890547c
Author: Translation commit bot
Date: Thu May 7 02:54:31 2020 +
https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
contents+zh-CN.po | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git
commit ed8f25589606b13c136937137e1953f8f6c18cc0
Author: Translation commit bot
Date: Thu May 7 02:24:37 2020 +
https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
contents+zh-CN.po | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
commit 68f9cf8fb2481d9116190b83d0303b38cf405b86
Author: Arlo Breault
Date: Wed May 6 12:51:52 2020 -0400
Bump package.json to match manifest.json
Trac: 34127
---
make.js | 11 ---
package.json | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git
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 e8fdba198eaf3c8d2a622bc02831e3533748c3f5
Merge: ae1ebb5f4 b16c1e4cf
Author: Nick Mathewson
Date: Wed May 6 17:07:47 2020 -0400
Merge branch 'maint-0.4.2' into maint-0.4.3
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
commit d46f67ef0e840760494e3411a00d13c6a35e7427
Merge: 28ac17f43 633366efc
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit 28ac17f433d954355494989983005498c7fe9292
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit c116728209e4ece3249564208e9387f67192a7f6
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit b444096be5ac509be1b2b68dc8e18ca1f558fef5
Author: Nick Mathewson
Date: Wed May 6 17:15:37 2020 -0400
Fix a boolean logic error when logging about invalid hostnames.
Fixes bug 34131; bugfix on 0.4.3.1-alpha.
---
changes/bug34131 | 4
commit d41f1cd3ed347c45c76cec891d7ff90a0cc6724c
Author: Nick Mathewson
Date: Wed May 6 17:07:12 2020 -0400
btrack_orconn_cevent.c: Add a missing "break;"
---
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
diff --git
commit ae1ebb5f44537acc04c0c0338c61b7bdf5a212dc
Merge: c11672820 d46f67ef0
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.2' into maint-0.4.3
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit b7fcbb28d4c3baae4099b709e8df65fc69a5697a
Author: Nick Mathewson
Date: Wed May 6 17:09:27 2020 -0400
connection_or_finished_flushing(): add a missing "break;"
This one is harmless like the others (so far)
---
src/core/or/connection_or.c | 1 +
1 file changed, 1 insertion(+)
commit b16c1e4cf61b9e383b1466eb1c034561be166939
Merge: d46f67ef0 d41f1cd3e
Author: Nick Mathewson
Date: Wed May 6 17:07:27 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
commit dd795fbee4c7ec8ec6ecfed46d25551bc1164921
Author: Nick Mathewson
Date: Wed May 6 16:58:06 2020 -0400
changes file for bug 34078.
---
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
diff --git a/changes/bug34078 b/changes/bug34078
new file mode 100644
index
commit a58dda96b64761c1df54c1a0cb5d21e12a6a0e49
Merge: 275b9f1e4 b444096be
Author: Nick Mathewson
Date: Wed May 6 17:18:46 2020 -0400
Merge branch 'maint-0.4.3' into release-0.4.3
changes/bug34131 | 4
src/core/or/connection_edge.c | 6 --
commit 633366efcd24e2221528c378d87f66fe35736f99
Merge: 79ff2b6aa dd795fbee
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit d41f1cd3ed347c45c76cec891d7ff90a0cc6724c
Author: Nick Mathewson
Date: Wed May 6 17:07:12 2020 -0400
btrack_orconn_cevent.c: Add a missing "break;"
---
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
diff --git
commit 275b9f1e416da918768e705b8e08ece9f02db8c7
Merge: 3b952e26e ae1ebb5f4
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.3' into release-0.4.3
changes/bug34078 | 5
src/app/config/quiet_level.c | 2 +-
commit 79ff2b6aab13011197e8342763de3cae48700dfb
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit b16c1e4cf61b9e383b1466eb1c034561be166939
Merge: d46f67ef0 d41f1cd3e
Author: Nick Mathewson
Date: Wed May 6 17:07:27 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
commit dd0ee016e9e386410c374d0dd421f5683ec8476e
Merge: 28f453c47 cc397449f
Author: Nick Mathewson
Date: Wed May 6 16:51:33 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.
commit f954514b376e6edbe8b1faba0726bdb46acf7729
Merge: d04b708b4 79ff2b6aa
Author: Nick Mathewson
Date: Wed May 6 16:53:06 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.
commit 792dbff8fb770ac69068fda525dc1538c31d69f1
Merge: 72c9d6dbf d41f1cd3e
Author: Nick Mathewson
Date: Wed May 6 17:18:46 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
commit cc397449fca8fb1559db3a790dffcd1e8046e86b
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit 633366efcd24e2221528c378d87f66fe35736f99
Merge: 79ff2b6aa dd795fbee
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit 72c9d6dbf7b6396326dcd3f7cd8a144868a64e57
Merge: 6c333e8e0 633366efc
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug34078 | 5
src/app/config/confparse.c| 8 +++---
commit b444096be5ac509be1b2b68dc8e18ca1f558fef5
Author: Nick Mathewson
Date: Wed May 6 17:15:37 2020 -0400
Fix a boolean logic error when logging about invalid hostnames.
Fixes bug 34131; bugfix on 0.4.3.1-alpha.
---
changes/bug34131 | 4
commit 28ac17f433d954355494989983005498c7fe9292
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit a1365b91ff43e6e520b9a881f720767418daccf6
Merge: 2cd1c0765 28ac17f43
Author: Nick Mathewson
Date: Wed May 6 16:54:12 2020 -0400
Merge branch 'maint-0.4.2' into maint-0.4.3
This is an "ours" merge to avoid taking the maint-0.4.2 version of the 34078
fix.
commit cc397449fca8fb1559db3a790dffcd1e8046e86b
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit cc397449fca8fb1559db3a790dffcd1e8046e86b
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit 79ff2b6aab13011197e8342763de3cae48700dfb
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit dd0ee016e9e386410c374d0dd421f5683ec8476e
Merge: 28f453c47 cc397449f
Author: Nick Mathewson
Date: Wed May 6 16:51:33 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.
commit f954514b376e6edbe8b1faba0726bdb46acf7729
Merge: d04b708b4 79ff2b6aa
Author: Nick Mathewson
Date: Wed May 6 16:53:06 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.
commit dd795fbee4c7ec8ec6ecfed46d25551bc1164921
Author: Nick Mathewson
Date: Wed May 6 16:58:06 2020 -0400
changes file for bug 34078.
---
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
diff --git a/changes/bug34078 b/changes/bug34078
new file mode 100644
index
commit dd795fbee4c7ec8ec6ecfed46d25551bc1164921
Author: Nick Mathewson
Date: Wed May 6 16:58:06 2020 -0400
changes file for bug 34078.
---
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
diff --git a/changes/bug34078 b/changes/bug34078
new file mode 100644
index
commit d46f67ef0e840760494e3411a00d13c6a35e7427
Merge: 28ac17f43 633366efc
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
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 79ff2b6aab13011197e8342763de3cae48700dfb
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit dd795fbee4c7ec8ec6ecfed46d25551bc1164921
Author: Nick Mathewson
Date: Wed May 6 16:58:06 2020 -0400
changes file for bug 34078.
---
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
diff --git a/changes/bug34078 b/changes/bug34078
new file mode 100644
index
commit cc397449fca8fb1559db3a790dffcd1e8046e86b
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit 3a785dd5beeaadcd4205f24d6949fdbbdfb5651e
Merge: e39b35f1d b444096be
Author: Nick Mathewson
Date: Wed May 6 17:17:19 2020 -0400
Merge branch 'maint-0.4.3'
changes/bug34131 | 4
src/core/or/connection_edge.c | 6 --
commit 789de7c35baa23ee34c709e15e743aa54a62a479
Merge: 01f1dae8b dd795fbee
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.3.5' into release-0.3.5
changes/bug34078 | 5
src/app/config/confparse.c | 8 +++---
commit d41f1cd3ed347c45c76cec891d7ff90a0cc6724c
Author: Nick Mathewson
Date: Wed May 6 17:07:12 2020 -0400
btrack_orconn_cevent.c: Add a missing "break;"
---
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
diff --git
commit b7fcbb28d4c3baae4099b709e8df65fc69a5697a
Author: Nick Mathewson
Date: Wed May 6 17:09:27 2020 -0400
connection_or_finished_flushing(): add a missing "break;"
This one is harmless like the others (so far)
---
src/core/or/connection_or.c | 1 +
1 file changed, 1 insertion(+)
commit 633366efcd24e2221528c378d87f66fe35736f99
Merge: 79ff2b6aa dd795fbee
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit e8fdba198eaf3c8d2a622bc02831e3533748c3f5
Merge: ae1ebb5f4 b16c1e4cf
Author: Nick Mathewson
Date: Wed May 6 17:07:47 2020 -0400
Merge branch 'maint-0.4.2' into maint-0.4.3
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
commit d41f1cd3ed347c45c76cec891d7ff90a0cc6724c
Author: Nick Mathewson
Date: Wed May 6 17:07:12 2020 -0400
btrack_orconn_cevent.c: Add a missing "break;"
---
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
diff --git
commit d46f67ef0e840760494e3411a00d13c6a35e7427
Merge: 28ac17f43 633366efc
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit e39b35f1de689fd1ad1ad3a6a902bf6371e6f5ce
Merge: 4a2347d29 ae1ebb5f4
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.3'
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
tor-commits
commit dd0ee016e9e386410c374d0dd421f5683ec8476e
Merge: 28f453c47 cc397449f
Author: Nick Mathewson
Date: Wed May 6 16:51:33 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.
commit 4a2347d2902c2688e766e4a83a5db69847b7b578
Merge: 42246f8c9 c11672820
Author: Nick Mathewson
Date: Wed May 6 16:55:41 2020 -0400
Merge branch 'maint-0.4.3'
Amazingly, this time we had no merge conflicts with "falls through"
comments.
src/app/config/quiet_level.c
commit b16c1e4cf61b9e383b1466eb1c034561be166939
Merge: d46f67ef0 d41f1cd3e
Author: Nick Mathewson
Date: Wed May 6 17:07:27 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
commit f954514b376e6edbe8b1faba0726bdb46acf7729
Merge: d04b708b4 79ff2b6aa
Author: Nick Mathewson
Date: Wed May 6 16:53:06 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.
commit cc397449fca8fb1559db3a790dffcd1e8046e86b
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit 79ff2b6aab13011197e8342763de3cae48700dfb
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit c116728209e4ece3249564208e9387f67192a7f6
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit dd0ee016e9e386410c374d0dd421f5683ec8476e
Merge: 28f453c47 cc397449f
Author: Nick Mathewson
Date: Wed May 6 16:51:33 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.
commit a1365b91ff43e6e520b9a881f720767418daccf6
Merge: 2cd1c0765 28ac17f43
Author: Nick Mathewson
Date: Wed May 6 16:54:12 2020 -0400
Merge branch 'maint-0.4.2' into maint-0.4.3
This is an "ours" merge to avoid taking the maint-0.4.2 version of the 34078
fix.
commit b7fcbb28d4c3baae4099b709e8df65fc69a5697a
Author: Nick Mathewson
Date: Wed May 6 17:09:27 2020 -0400
connection_or_finished_flushing(): add a missing "break;"
This one is harmless like the others (so far)
---
src/core/or/connection_or.c | 1 +
1 file changed, 1 insertion(+)
commit e8fdba198eaf3c8d2a622bc02831e3533748c3f5
Merge: ae1ebb5f4 b16c1e4cf
Author: Nick Mathewson
Date: Wed May 6 17:07:47 2020 -0400
Merge branch 'maint-0.4.2' into maint-0.4.3
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
commit 633366efcd24e2221528c378d87f66fe35736f99
Merge: 79ff2b6aa dd795fbee
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit b16c1e4cf61b9e383b1466eb1c034561be166939
Merge: d46f67ef0 d41f1cd3e
Author: Nick Mathewson
Date: Wed May 6 17:07:27 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
commit 28ac17f433d954355494989983005498c7fe9292
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit ae1ebb5f44537acc04c0c0338c61b7bdf5a212dc
Merge: c11672820 d46f67ef0
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.2' into maint-0.4.3
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit b444096be5ac509be1b2b68dc8e18ca1f558fef5
Author: Nick Mathewson
Date: Wed May 6 17:15:37 2020 -0400
Fix a boolean logic error when logging about invalid hostnames.
Fixes bug 34131; bugfix on 0.4.3.1-alpha.
---
changes/bug34131 | 4
commit dd795fbee4c7ec8ec6ecfed46d25551bc1164921
Author: Nick Mathewson
Date: Wed May 6 16:58:06 2020 -0400
changes file for bug 34078.
---
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
diff --git a/changes/bug34078 b/changes/bug34078
new file mode 100644
index
commit b16c1e4cf61b9e383b1466eb1c034561be166939
Merge: d46f67ef0 d41f1cd3e
Author: Nick Mathewson
Date: Wed May 6 17:07:27 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
commit dd0ee016e9e386410c374d0dd421f5683ec8476e
Merge: 28f453c47 cc397449f
Author: Nick Mathewson
Date: Wed May 6 16:51:33 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.
commit dd795fbee4c7ec8ec6ecfed46d25551bc1164921
Author: Nick Mathewson
Date: Wed May 6 16:58:06 2020 -0400
changes file for bug 34078.
---
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
diff --git a/changes/bug34078 b/changes/bug34078
new file mode 100644
index
commit f954514b376e6edbe8b1faba0726bdb46acf7729
Merge: d04b708b4 79ff2b6aa
Author: Nick Mathewson
Date: Wed May 6 16:53:06 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.
commit 79ff2b6aab13011197e8342763de3cae48700dfb
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit d41f1cd3ed347c45c76cec891d7ff90a0cc6724c
Author: Nick Mathewson
Date: Wed May 6 17:07:12 2020 -0400
btrack_orconn_cevent.c: Add a missing "break;"
---
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
diff --git
commit f954514b376e6edbe8b1faba0726bdb46acf7729
Merge: d04b708b4 79ff2b6aa
Author: Nick Mathewson
Date: Wed May 6 16:53:06 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.
commit d46f67ef0e840760494e3411a00d13c6a35e7427
Merge: 28ac17f43 633366efc
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit 79ff2b6aab13011197e8342763de3cae48700dfb
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit d41f1cd3ed347c45c76cec891d7ff90a0cc6724c
Author: Nick Mathewson
Date: Wed May 6 17:07:12 2020 -0400
btrack_orconn_cevent.c: Add a missing "break;"
---
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
diff --git
commit c116728209e4ece3249564208e9387f67192a7f6
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit 28ac17f433d954355494989983005498c7fe9292
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit d46f67ef0e840760494e3411a00d13c6a35e7427
Merge: 28ac17f43 633366efc
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit 633366efcd24e2221528c378d87f66fe35736f99
Merge: 79ff2b6aa dd795fbee
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit ae1ebb5f44537acc04c0c0338c61b7bdf5a212dc
Merge: c11672820 d46f67ef0
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.2' into maint-0.4.3
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit 28ac17f433d954355494989983005498c7fe9292
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit dd795fbee4c7ec8ec6ecfed46d25551bc1164921
Author: Nick Mathewson
Date: Wed May 6 16:58:06 2020 -0400
changes file for bug 34078.
---
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
diff --git a/changes/bug34078 b/changes/bug34078
new file mode 100644
index
commit cc397449fca8fb1559db3a790dffcd1e8046e86b
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit 633366efcd24e2221528c378d87f66fe35736f99
Merge: 79ff2b6aa dd795fbee
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit a1365b91ff43e6e520b9a881f720767418daccf6
Merge: 2cd1c0765 28ac17f43
Author: Nick Mathewson
Date: Wed May 6 16:54:12 2020 -0400
Merge branch 'maint-0.4.2' into maint-0.4.3
This is an "ours" merge to avoid taking the maint-0.4.2 version of the 34078
fix.
commit dd0ee016e9e386410c374d0dd421f5683ec8476e
Merge: 28f453c47 cc397449f
Author: Nick Mathewson
Date: Wed May 6 16:51:33 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.
commit 633366efcd24e2221528c378d87f66fe35736f99
Merge: 79ff2b6aa dd795fbee
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit cc397449fca8fb1559db3a790dffcd1e8046e86b
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit 79ff2b6aab13011197e8342763de3cae48700dfb
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit d41f1cd3ed347c45c76cec891d7ff90a0cc6724c
Author: Nick Mathewson
Date: Wed May 6 17:07:12 2020 -0400
btrack_orconn_cevent.c: Add a missing "break;"
---
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
diff --git
commit dd795fbee4c7ec8ec6ecfed46d25551bc1164921
Author: Nick Mathewson
Date: Wed May 6 16:58:06 2020 -0400
changes file for bug 34078.
---
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
diff --git a/changes/bug34078 b/changes/bug34078
new file mode 100644
index
commit dd795fbee4c7ec8ec6ecfed46d25551bc1164921
Author: Nick Mathewson
Date: Wed May 6 16:58:06 2020 -0400
changes file for bug 34078.
---
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
diff --git a/changes/bug34078 b/changes/bug34078
new file mode 100644
index
commit cc397449fca8fb1559db3a790dffcd1e8046e86b
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit dd0ee016e9e386410c374d0dd421f5683ec8476e
Merge: 28f453c47 cc397449f
Author: Nick Mathewson
Date: Wed May 6 16:51:33 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.
commit cc397449fca8fb1559db3a790dffcd1e8046e86b
Author: Nick Mathewson
Date: Wed May 6 10:45:48 2020 -0400
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial
commit d04b708b4bd47ee8df6796f19b25f558b2b18e91
Merge: bbfc498e2 28f453c47
Author: Nick Mathewson
Date: Wed May 6 16:47:03 2020 -0400
Merge branch 'maint-0.4.1' into maint-0.4.2
configure.ac | 16
src/core/proto/proto_socks.c | 5 -
commit 28f453c4764962394bf0cd3a314b2b60af7ee1b4
Merge: 104130609 78a72f819
Author: Nick Mathewson
Date: Wed May 6 16:47:03 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
1 - 100 of 223 matches
Mail list logo