commit 9aab54abc0fa0f8bea54ab75fa8a71e64f0b2035
Author: Translation commit bot
Date: Wed Sep 12 02:48:57 2018 +
Update translations for torbutton-browseronboardingproperties_completed
---
es_AR/browserOnboarding.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff
commit ef6361466b79cd8032b4bf9eb1afeef80b30b681
Author: Translation commit bot
Date: Wed Sep 12 02:48:51 2018 +
Update translations for torbutton-browseronboardingproperties
---
es_AR/browserOnboarding.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
commit 352a7e83caa0085d8fcef7f87b6c35deb7112795
Author: Translation commit bot
Date: Tue Sep 11 21:15:44 2018 +
Update translations for liveusb-creator_completed
---
ca/ca.po | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/ca/ca.po b/ca/ca.po
index
commit 2a79bc0d830c6ab01bfbea102b787a34dbb80507
Author: Translation commit bot
Date: Tue Sep 11 21:15:39 2018 +
Update translations for liveusb-creator
---
ca/ca.po | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/ca/ca.po b/ca/ca.po
index
commit f28898e95524d9e4865f93c002ff937b969acd52
Author: Translation commit bot
Date: Tue Sep 11 20:48:43 2018 +
Update translations for tor-launcher-properties_completed
---
ca/torlauncher.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
commit bc3c3e81c7071d23803013c03c5dab70ccf70476
Author: Translation commit bot
Date: Tue Sep 11 20:48:38 2018 +
Update translations for tor-launcher-properties
---
ca/torlauncher.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ca/torlauncher.properties
commit d4c0137a82e80f1569803d38f979b033a76d107d
Author: Translation commit bot
Date: Tue Sep 11 20:46:52 2018 +
Update translations for tails-persistence-setup_completed
---
da/da.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/da/da.po b/da/da.po
index
commit e0d62af6ebd23005d535c500b21729174835b0bc
Author: Translation commit bot
Date: Tue Sep 11 20:46:46 2018 +
Update translations for tails-persistence-setup
---
da/da.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/da/da.po b/da/da.po
index
commit 82bf382f751fbf4a17daecaeccf30425f1de2678
Author: Translation commit bot
Date: Tue Sep 11 20:46:11 2018 +
Update translations for tails-iuk_completed
---
da.po | 94 +--
1 file changed, 47 insertions(+), 47
commit 6be9814150b3e42a8cd6bf00f07f76ba090ad2cf
Author: Translation commit bot
Date: Tue Sep 11 20:46:05 2018 +
Update translations for tails-iuk
---
da.po | 94 +--
1 file changed, 47 insertions(+), 47 deletions(-)
diff
commit 38a6e96c66503b45aefea73b72f145a3f5eb7d2e
Author: Translation commit bot
Date: Tue Sep 11 20:45:55 2018 +
Update translations for tails-misc
---
da.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/da.po b/da.po
index 8c2c5ff94..eb19626e5 100644
---
commit e2988e044dc3d8d14b70ff606edd3494aff6bc05
Author: Taylor Yu
Date: Tue Aug 28 14:18:10 2018 -0500
Deindent much of control_event_bootstrap
---
src/feature/control/control.c | 62 ---
1 file changed, 29 insertions(+), 33 deletions(-)
diff --git
commit 5733d3f71f0094c2eade64795521321cd653855b
Author: Taylor Yu
Date: Tue Aug 28 14:52:44 2018 -0500
Refactor control_event_bootstrap_core() more
Eliminate a few conditional expressions in
control_event_bootstrap_core() by overwriting the status parameter.
---
commit 15c24d669f86715c3c24d1a50b377bd8ac65b0a7
Author: Taylor Yu
Date: Tue Aug 28 14:31:51 2018 -0500
Refactor control_event_bootstrap() somewhat
Move the mostly-invariant part of control_event_boostrap() into a
helper control_event_bootstrap_core(). The helper doesn't
commit 687bf3ea645ef8c5ce8c9f02a25274121ca13318
Author: Taylor Yu
Date: Fri Aug 31 17:54:09 2018 -0500
Track bootstrap phase independently of progress
Track bootstrap phase (enumerated by bootstrap_status_t) independently
from the bootstrap progress (which can represent
commit 5a2374b0740ce662e4b323f104c8ff58164d996a
Merge: 902b34a0d 617160895
Author: Nick Mathewson
Date: Tue Sep 11 15:55:30 2018 -0400
Merge remote-tracking branch 'tor-github/pr/315'
changes/ticket27169 | 6 ++
src/core/or/circuitbuild.c| 12 ++--
commit 617160895ce9bb403fe5a864925ffb1894f9086c
Author: Taylor Yu
Date: Fri Aug 31 12:56:23 2018 -0500
Defer reporting directory bootstrap progress
Existing cached directory information can cause misleadingly high
bootstrap percentages. To improve user experience, defer
commit eee62e13d97e3f07c0d8577f34729f4192738b44
Author: Taylor Yu
Date: Tue Aug 28 13:30:58 2018 -0500
Make control_event_bootstrap() return void
Simplify control_event_bootstrap() by making it return void again. It
is currently a fairly complicated function, and it's made
commit affbe376f9a15c7c839287b8127d3bd9ac2eab02
Merge: 89c5b8d7d ae1aea4cc
Author: Nick Mathewson
Date: Tue Sep 11 15:53:06 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+), 2
commit 80b13f7e1e637390e7cde5695800e6a16f4f08fa
Merge: 337204915 affbe376f
Author: Nick Mathewson
Date: Tue Sep 11 15:53:06 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+),
commit ae1aea4cc490658e917b0c08584c7115a57da00b
Author: Mike Perry
Date: Tue Mar 13 13:50:35 2018 +
Bug 25505: Check circuitmux queues before padding.
---
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff
commit ae1aea4cc490658e917b0c08584c7115a57da00b
Author: Mike Perry
Date: Tue Mar 13 13:50:35 2018 +
Bug 25505: Check circuitmux queues before padding.
---
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff
commit 902b34a0debeee92cb5844ec87c55db9f447562b
Merge: 2d0a6d769 affbe376f
Author: Nick Mathewson
Date: Tue Sep 11 15:53:06 2018 -0400
Merge branch 'maint-0.3.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit ae1aea4cc490658e917b0c08584c7115a57da00b
Author: Mike Perry
Date: Tue Mar 13 13:50:35 2018 +
Bug 25505: Check circuitmux queues before padding.
---
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff
commit affbe376f9a15c7c839287b8127d3bd9ac2eab02
Merge: 89c5b8d7d ae1aea4cc
Author: Nick Mathewson
Date: Tue Sep 11 15:53:06 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+), 2
commit 1239fcfc37aaf6b732e0733ad747a7b3e56534c4
Merge: 95f06d61d ae1aea4cc
Author: Nick Mathewson
Date: Tue Sep 11 15:53:06 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+),
commit affbe376f9a15c7c839287b8127d3bd9ac2eab02
Merge: 89c5b8d7d ae1aea4cc
Author: Nick Mathewson
Date: Tue Sep 11 15:53:06 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+), 2
commit ae1aea4cc490658e917b0c08584c7115a57da00b
Author: Mike Perry
Date: Tue Mar 13 13:50:35 2018 +
Bug 25505: Check circuitmux queues before padding.
---
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff
commit ae1aea4cc490658e917b0c08584c7115a57da00b
Author: Mike Perry
Date: Tue Mar 13 13:50:35 2018 +
Bug 25505: Check circuitmux queues before padding.
---
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff
commit 32683b9b9693b26b09e6189971702165c8b3145c
Author: Translation commit bot
Date: Tue Sep 11 19:19:01 2018 +
Update translations for support-portal
---
contents+pt_BR.po | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/contents+pt_BR.po
commit a38e211aa924fe94446e11d7709665b8123b413c
Author: Translation commit bot
Date: Tue Sep 11 18:48:53 2018 +
Update translations for support-portal
---
contents+pt_BR.po | 51 +++
1 file changed, 35 insertions(+), 16 deletions(-)
commit cd7e431ba32d8ba5cd4afac1f2afd4062244590f
Author: Translation commit bot
Date: Tue Sep 11 18:47:25 2018 +
Update translations for tor-browser-manual_completed
---
es_AR/es_AR.po | 382 -
1 file changed, 271 insertions(+),
commit 581c16e7f592e31c29aecda2b22cf1db7c9f889a
Author: Translation commit bot
Date: Tue Sep 11 18:47:19 2018 +
Update translations for tor-browser-manual
---
es_AR/es_AR.po | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/es_AR/es_AR.po
commit 2d0a6d76916d61e6264d8537e0d99daeae9829ba
Merge: 785249981 578aaa7f1
Author: Nick Mathewson
Date: Tue Sep 11 14:32:39 2018 -0400
Merge remote-tracking branch 'mikeperry/bug25505'
changes/bug25505 | 3 +++
src/core/or/channelpadding.c | 9 +++--
2 files changed, 10
commit 578aaa7f122df32cdf4ffe713bc8aa179433fb0b
Author: Mike Perry
Date: Tue Mar 13 13:50:35 2018 +
Bug 25505: Check circuitmux queues before padding.
---
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff
commit 6cc84a16da93a1fe2a1a4c7a050c4b83a7d2a8e6
Author: Translation commit bot
Date: Tue Sep 11 18:18:59 2018 +
Update translations for support-portal
---
contents+pt_BR.po | 38 +++---
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git
commit dfb962648ea120f369269b88d5b91ec5bb340a12
Author: Translation commit bot
Date: Tue Sep 11 18:17:24 2018 +
Update translations for tor-browser-manual
---
es_AR/es_AR.po | 43 ++-
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git
commit 7852499812a4bbe707ff0da065a853de69be2c4d
Merge: 75ad1a1f2 1e296bc6d
Author: Nick Mathewson
Date: Tue Sep 11 14:05:16 2018 -0400
Merge remote-tracking branch 'tor-github/pr/312'
changes/ticket8415 | 4
src/core/mainloop/main.c | 5 +
2 files changed, 9 insertions(+)
commit 1e296bc6de010f1de8877ad9ed9b9d2a21b13801
Author: rl1987
Date: Tue Sep 4 21:39:11 2018 +0300
Call event_set_mem_functions during initialization
---
changes/ticket8415 | 4
src/core/mainloop/main.c | 5 +
2 files changed, 9 insertions(+)
diff --git
commit f1f3c01bc8c0874980b23b43121dea06a01c194c
Author: Translation commit bot
Date: Tue Sep 11 17:47:20 2018 +
Update translations for tor-browser-manual
---
es_AR/es_AR.po | 45 -
1 file changed, 44 insertions(+), 1 deletion(-)
diff --git
commit 3b4ef708ee9536318b8f72b9d63c341bee61db5a
Author: Translation commit bot
Date: Tue Sep 11 17:18:14 2018 +
Update translations for torbutton-browseronboardingproperties_completed
---
es_AR/browserOnboarding.properties | 54 ++
1 file changed,
commit 7a17f0e97de05d064708ff75fe00ec2784d1c509
Author: Translation commit bot
Date: Tue Sep 11 17:18:09 2018 +
Update translations for torbutton-browseronboardingproperties
---
es_AR/browserOnboarding.properties | 40 +++---
1 file changed, 20
commit 75ad1a1f2fca79dd2e48cfe1416d21a2b82b76b6
Merge: 042a9fd8b 6c0e7a9e1
Author: Nick Mathewson
Date: Tue Sep 11 13:16:49 2018 -0400
Merge remote-tracking branch 'onionk/doublevote1'
src/test/test_protover.c | 8
1 file changed, 8 insertions(+)
commit 6c0e7a9e1a43db307244c16b4290b292c035fa63
Author: cypherpunks
Date: Sat Aug 18 18:15:59 2018 +
test/protover: add double-voting test
---
src/test/test_protover.c | 8
1 file changed, 8 insertions(+)
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index
commit 1d8957129b51826b41f8f9efb7b13c4506222bf5
Merge: 8e714d2a0 5a8827a4c
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.3.2' into maint-0.3.3
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 198b6354e6c58ab4276461b5215487b8e9c15683
Merge: 19429fac2 7cea5a287
Author: Nick Mathewson
Date: Tue Sep 11 13:08:57 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
.travis.yml | 13 +++--
changes/ticket27252 | 6 ++
2 files
commit 337204915479dab7057f73319866bfa63205c58e
Merge: f59b10750 89c5b8d7d
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
.travis.yml | 27 +--
changes/ticket27252 | 6 ++
commit 89c5b8d7dc4b22a3c91241a6e91edc41c2c6b362
Merge: 46bccc50e 1d8957129
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit e8dd83aecb6faaca81e7c808010ae08c2ac574c9
Merge: 573b6e4f2 ae2085dd7
Author: teor
Date: Thu Aug 23 18:20:17 2018 +1000
Merge branch 'ticket27252-033' into ticket27252-034
Semantic merge:
- Rust offline and online were swapped in ticket27252-032
.travis.yml
commit 92f1a8af836933a3488e32bb03f859d5548883d7
Author: teor
Date: Thu Aug 23 17:24:38 2018 +1000
Travis: Skip offline rust builds for Linux gcc
We already do an online rust build for Linux gcc.
Part of 27252.
---
.travis.yml | 6 ++
commit 8f89fb8f398c365588d456625c77cdaee97c77bd
Author: teor
Date: Thu Aug 23 17:00:42 2018 +1000
Travis: skip gcc on OSX, because the default compiler is clang
Part of #27252.
---
.travis.yml | 3 +++
changes/ticket27252 | 3 +++
2 files changed, 6 insertions(+)
diff
commit 46bccc50e53b1adde2065ad3ccf6ff538674c630
Merge: 8a873a569 da17875ea
Author: Nick Mathewson
Date: Tue Sep 11 13:09:18 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4
.travis.yml | 27 +--
changes/ticket27252 |
commit da17875ea5cf206e406c58991b455c9d2fb7d478
Author: teor
Date: Thu Aug 23 17:43:03 2018 +1000
Travis: Don't do a distcheck with --disable-module-dirauth
Part of 27252.
---
.travis.yml | 4 ++--
changes/ticket27252-034 | 3 +++
2 files changed, 5 insertions(+), 2
commit ae2085dd7be279b0fc3ff9c582d35a498c63350a
Merge: 8691046ac 92f1a8af8
Author: teor
Date: Thu Aug 23 18:18:50 2018 +1000
Merge branch 'ticket27252-032' into ticket27252-033
Semantic merge:
- Rust offline and online were swapped in ticket27252-032
-
commit 5a8827a4c98a354c775060f6c85c05a97c56e9b4
Merge: c3a750486 198b6354e
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 8e714d2a025618a7618b3b756e5ef96dea7496b8
Merge: 8afc100cb ae2085dd7
Author: Nick Mathewson
Date: Tue Sep 11 13:09:09 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
.travis.yml | 23 +++
changes/ticket27252 | 6
commit 9f81e03262ef3ba6491eaf14a93ec9c6e7bf5b45
Author: teor
Date: Thu Aug 23 18:12:36 2018 +1000
Travis: make the exclude descriptions shorter
Part of 27252.
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index
commit 99a2ecc79562dc340f73f998e5c441f3a7968e1a
Merge: c1ad40627 7cea5a287
Author: teor
Date: Thu Aug 23 18:15:55 2018 +1000
Merge branch 'ticket27252-029' into ticket27252-032
This commit is already implemented in 0.3.2 and later:
- Travis: Skip a duplicate hardening-off
commit 7ec84cc0942af27136d27e6a9085e02b07c61da1
Author: teor
Date: Thu Aug 23 17:06:53 2018 +1000
Travis: Skip a duplicate hardening-off build in Tor 0.2.9
Part of 27252.
---
.travis.yml | 3 ++-
changes/ticket27252 | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
commit 7cea5a287fbf0ed1b9ed92e144ff450c4f93f382
Author: teor
Date: Thu Aug 23 18:13:53 2018 +1000
Travis: Skip gcc on Linux with default settings
It's redundant, because all the non-default builds use gcc on Linux.
Part of 27252.
---
.travis.yml | 5 +
commit c3a750486c8d156ffb5dff6c4d773dd61d6cb46c
Merge: 3119cb506 92f1a8af8
Author: Nick Mathewson
Date: Tue Sep 11 13:09:04 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
.travis.yml | 22 ++
changes/ticket27252 | 6
commit b61d40c8a24ccbd5a08038f9d4d2d38cf987c400
Author: teor
Date: Thu Aug 23 17:23:38 2018 +1000
Travis: Only run one online rust build, to reduce network errors
Part of 27252.
---
.travis.yml | 6 +++---
changes/ticket27252-032 | 3 +++
2 files changed, 6
commit 198b6354e6c58ab4276461b5215487b8e9c15683
Merge: 19429fac2 7cea5a287
Author: Nick Mathewson
Date: Tue Sep 11 13:08:57 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
.travis.yml | 13 +++--
changes/ticket27252 | 6 ++
2 files
commit 1d8957129b51826b41f8f9efb7b13c4506222bf5
Merge: 8e714d2a0 5a8827a4c
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.3.2' into maint-0.3.3
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 95f06d61d09b81039ee44ec7329e9d37fdc75ba0
Merge: 7df92c0e0 1d8957129
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
.travis.yml | 23 +++
changes/ticket27252 | 6 ++
commit 5a8827a4c98a354c775060f6c85c05a97c56e9b4
Merge: c3a750486 198b6354e
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit b61d40c8a24ccbd5a08038f9d4d2d38cf987c400
Author: teor
Date: Thu Aug 23 17:23:38 2018 +1000
Travis: Only run one online rust build, to reduce network errors
Part of 27252.
---
.travis.yml | 6 +++---
changes/ticket27252-032 | 3 +++
2 files changed, 6
commit 99a2ecc79562dc340f73f998e5c441f3a7968e1a
Merge: c1ad40627 7cea5a287
Author: teor
Date: Thu Aug 23 18:15:55 2018 +1000
Merge branch 'ticket27252-029' into ticket27252-032
This commit is already implemented in 0.3.2 and later:
- Travis: Skip a duplicate hardening-off
commit 7ec84cc0942af27136d27e6a9085e02b07c61da1
Author: teor
Date: Thu Aug 23 17:06:53 2018 +1000
Travis: Skip a duplicate hardening-off build in Tor 0.2.9
Part of 27252.
---
.travis.yml | 3 ++-
changes/ticket27252 | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
commit 198b6354e6c58ab4276461b5215487b8e9c15683
Merge: 19429fac2 7cea5a287
Author: Nick Mathewson
Date: Tue Sep 11 13:08:57 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
.travis.yml | 13 +++--
changes/ticket27252 | 6 ++
2 files
commit c3a750486c8d156ffb5dff6c4d773dd61d6cb46c
Merge: 3119cb506 92f1a8af8
Author: Nick Mathewson
Date: Tue Sep 11 13:09:04 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
.travis.yml | 22 ++
changes/ticket27252 | 6
commit 9f81e03262ef3ba6491eaf14a93ec9c6e7bf5b45
Author: teor
Date: Thu Aug 23 18:12:36 2018 +1000
Travis: make the exclude descriptions shorter
Part of 27252.
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index
commit 8e714d2a025618a7618b3b756e5ef96dea7496b8
Merge: 8afc100cb ae2085dd7
Author: Nick Mathewson
Date: Tue Sep 11 13:09:09 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
.travis.yml | 23 +++
changes/ticket27252 | 6
commit ae2085dd7be279b0fc3ff9c582d35a498c63350a
Merge: 8691046ac 92f1a8af8
Author: teor
Date: Thu Aug 23 18:18:50 2018 +1000
Merge branch 'ticket27252-032' into ticket27252-033
Semantic merge:
- Rust offline and online were swapped in ticket27252-032
-
commit 5a8827a4c98a354c775060f6c85c05a97c56e9b4
Merge: c3a750486 198b6354e
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 7ec84cc0942af27136d27e6a9085e02b07c61da1
Author: teor
Date: Thu Aug 23 17:06:53 2018 +1000
Travis: Skip a duplicate hardening-off build in Tor 0.2.9
Part of 27252.
---
.travis.yml | 3 ++-
changes/ticket27252 | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
commit 9f81e03262ef3ba6491eaf14a93ec9c6e7bf5b45
Author: teor
Date: Thu Aug 23 18:12:36 2018 +1000
Travis: make the exclude descriptions shorter
Part of 27252.
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index
commit 8f89fb8f398c365588d456625c77cdaee97c77bd
Author: teor
Date: Thu Aug 23 17:00:42 2018 +1000
Travis: skip gcc on OSX, because the default compiler is clang
Part of #27252.
---
.travis.yml | 3 +++
changes/ticket27252 | 3 +++
2 files changed, 6 insertions(+)
diff
commit 0bef3a21cc749550e47dfeaadb9843e91567e841
Merge: 0dcf29793 5a8827a4c
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.3.2' into release-0.3.2
.travis.yml | 22 ++
changes/ticket27252 | 6 ++
commit 7cea5a287fbf0ed1b9ed92e144ff450c4f93f382
Author: teor
Date: Thu Aug 23 18:13:53 2018 +1000
Travis: Skip gcc on Linux with default settings
It's redundant, because all the non-default builds use gcc on Linux.
Part of 27252.
---
.travis.yml | 5 +
commit b61d40c8a24ccbd5a08038f9d4d2d38cf987c400
Author: teor
Date: Thu Aug 23 17:23:38 2018 +1000
Travis: Only run one online rust build, to reduce network errors
Part of 27252.
---
.travis.yml | 6 +++---
changes/ticket27252-032 | 3 +++
2 files changed, 6
commit c3a750486c8d156ffb5dff6c4d773dd61d6cb46c
Merge: 3119cb506 92f1a8af8
Author: Nick Mathewson
Date: Tue Sep 11 13:09:04 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
.travis.yml | 22 ++
changes/ticket27252 | 6
commit 92f1a8af836933a3488e32bb03f859d5548883d7
Author: teor
Date: Thu Aug 23 17:24:38 2018 +1000
Travis: Skip offline rust builds for Linux gcc
We already do an online rust build for Linux gcc.
Part of 27252.
---
.travis.yml | 6 ++
commit 92f1a8af836933a3488e32bb03f859d5548883d7
Author: teor
Date: Thu Aug 23 17:24:38 2018 +1000
Travis: Skip offline rust builds for Linux gcc
We already do an online rust build for Linux gcc.
Part of 27252.
---
.travis.yml | 6 ++
commit 99a2ecc79562dc340f73f998e5c441f3a7968e1a
Merge: c1ad40627 7cea5a287
Author: teor
Date: Thu Aug 23 18:15:55 2018 +1000
Merge branch 'ticket27252-029' into ticket27252-032
This commit is already implemented in 0.3.2 and later:
- Travis: Skip a duplicate hardening-off
commit 8f89fb8f398c365588d456625c77cdaee97c77bd
Author: teor
Date: Thu Aug 23 17:00:42 2018 +1000
Travis: skip gcc on OSX, because the default compiler is clang
Part of #27252.
---
.travis.yml | 3 +++
changes/ticket27252 | 3 +++
2 files changed, 6 insertions(+)
diff
commit 7cea5a287fbf0ed1b9ed92e144ff450c4f93f382
Author: teor
Date: Thu Aug 23 18:13:53 2018 +1000
Travis: Skip gcc on Linux with default settings
It's redundant, because all the non-default builds use gcc on Linux.
Part of 27252.
---
.travis.yml | 5 +
commit 9f81e03262ef3ba6491eaf14a93ec9c6e7bf5b45
Author: teor
Date: Thu Aug 23 18:12:36 2018 +1000
Travis: make the exclude descriptions shorter
Part of 27252.
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index
commit 198b6354e6c58ab4276461b5215487b8e9c15683
Merge: 19429fac2 7cea5a287
Author: Nick Mathewson
Date: Tue Sep 11 13:08:57 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
.travis.yml | 13 +++--
changes/ticket27252 | 6 ++
2 files
commit 7cea5a287fbf0ed1b9ed92e144ff450c4f93f382
Author: teor
Date: Thu Aug 23 18:13:53 2018 +1000
Travis: Skip gcc on Linux with default settings
It's redundant, because all the non-default builds use gcc on Linux.
Part of 27252.
---
.travis.yml | 5 +
commit 042a9fd8b008ad004c2a11ed18298b5cd3b60a37
Merge: 328bcbf30 89c5b8d7d
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.3.4'
.travis.yml | 27 +--
changes/ticket27252 | 6 ++
changes/ticket27252-032 | 5
commit 8f89fb8f398c365588d456625c77cdaee97c77bd
Author: teor
Date: Thu Aug 23 17:00:42 2018 +1000
Travis: skip gcc on OSX, because the default compiler is clang
Part of #27252.
---
.travis.yml | 3 +++
changes/ticket27252 | 3 +++
2 files changed, 6 insertions(+)
diff
commit 198b6354e6c58ab4276461b5215487b8e9c15683
Merge: 19429fac2 7cea5a287
Author: Nick Mathewson
Date: Tue Sep 11 13:08:57 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
.travis.yml | 13 +++--
changes/ticket27252 | 6 ++
2 files
commit 5a8827a4c98a354c775060f6c85c05a97c56e9b4
Merge: c3a750486 198b6354e
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 7ec84cc0942af27136d27e6a9085e02b07c61da1
Author: teor
Date: Thu Aug 23 17:06:53 2018 +1000
Travis: Skip a duplicate hardening-off build in Tor 0.2.9
Part of 27252.
---
.travis.yml | 3 ++-
changes/ticket27252 | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
commit 89c5b8d7dc4b22a3c91241a6e91edc41c2c6b362
Merge: 46bccc50e 1d8957129
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 1d8957129b51826b41f8f9efb7b13c4506222bf5
Merge: 8e714d2a0 5a8827a4c
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.3.2' into maint-0.3.3
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit d96cef1baa7b36125807b2cb95b70cccb3aa09b8
Merge: b69fe15b5 198b6354e
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.2.9' into release-0.2.9
.travis.yml | 13 +++--
changes/ticket27252 | 6 ++
2 files changed, 17 insertions(+),
commit c3a750486c8d156ffb5dff6c4d773dd61d6cb46c
Merge: 3119cb506 92f1a8af8
Author: Nick Mathewson
Date: Tue Sep 11 13:09:04 2018 -0400
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
.travis.yml | 22 ++
changes/ticket27252 | 6
commit da17875ea5cf206e406c58991b455c9d2fb7d478
Author: teor
Date: Thu Aug 23 17:43:03 2018 +1000
Travis: Don't do a distcheck with --disable-module-dirauth
Part of 27252.
---
.travis.yml | 4 ++--
changes/ticket27252-034 | 3 +++
2 files changed, 5 insertions(+), 2
1 - 100 of 252 matches
Mail list logo