commit bd3d6c0ee3a28b4f53f0b0891dcaa8cae813d0b3
Author: Translation commit bot
Date: Wed Oct 31 05:45:58 2018 +
Update translations for tails-misc
---
zh_CN.po | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/zh_CN.po b/zh_CN.po
index
commit 86db139550de448b9f17e7977c2f3e6c03d388a4
Author: Translation commit bot
Date: Wed Oct 31 05:16:00 2018 +
Update translations for tails-misc
---
zh_CN.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/zh_CN.po b/zh_CN.po
index 9195f84a7..4f20882a9
commit 4895d2bcc6fea071329dced100b4486c56a1fd12
Author: Translation commit bot
Date: Wed Oct 31 04:46:01 2018 +
Update translations for tails-misc
---
zh_CN.po | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/zh_CN.po b/zh_CN.po
index
commit ce2422807ec0b8d0cf66ffc10adf6ee746bec496
Author: Translation commit bot
Date: Wed Oct 31 04:16:04 2018 +
Update translations for tails-misc
---
zh_CN.po | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/zh_CN.po b/zh_CN.po
index
commit 53e93c5941bfbfd394e10c6a113ea5b940458a14
Author: Translation commit bot
Date: Tue Oct 30 21:17:34 2018 +
Update translations for tor-browser-manual_completed
---
el/el.po | 75
1 file changed, 37 insertions(+), 38
commit c779d01918200db56bb07d4297a2baf22e2df9b8
Author: Translation commit bot
Date: Tue Oct 30 21:17:29 2018 +
Update translations for tor-browser-manual
---
el/el.po | 75
1 file changed, 37 insertions(+), 38
commit 3b4f9216367929dfc3ffeb86cf48965db15b94b0
Author: Damian Johnson
Date: Tue Oct 30 14:07:20 2018 -0700
Update Linus' photo and pronoun
---
about/en/corepeople.wml| 1 +
images/people/ln5.png | Bin 34926 -> 32291 bytes
images/people/orig/ln5.jpg | Bin 18819 -> 54715 bytes
commit 83416313bc01e6b679ed152d502eae364b9f12e2
Author: Translation commit bot
Date: Tue Oct 30 20:47:39 2018 +
Update translations for tor-browser-manual
---
el/el.po | 49 +
1 file changed, 25 insertions(+), 24 deletions(-)
diff --git
commit a55d18bc98489b985c7bb02c41d6fe8a6e3100f0
Author: Translation commit bot
Date: Tue Oct 30 20:47:45 2018 +
Update translations for tor-browser-manual_completed
---
el/el.po | 49 +
1 file changed, 25 insertions(+), 24 deletions(-)
commit f399ca6379f8f97cf56ad7cf2db194d53832c17a
Author: Translation commit bot
Date: Tue Oct 30 20:46:09 2018 +
Update translations for tails-misc
---
el.po | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/el.po b/el.po
index cb154beea..cf8f6d60d 100644
commit 959598c551e8d6aba7653c818deda50ab1d3d048
Author: Translation commit bot
Date: Tue Oct 30 20:45:56 2018 +
Update translations for liveusb-creator_completed
---
el/el.po | 86
1 file changed, 43 insertions(+), 43
commit ad5df4bb4fdfc15305534ebec3178a2b9ae7602b
Author: Translation commit bot
Date: Tue Oct 30 20:46:14 2018 +
Update translations for tails-misc_completed
---
el.po | 163 ++
1 file changed, 103 insertions(+), 60
commit 79d29f605a60874291b944a7df79320fee5c3537
Author: Translation commit bot
Date: Tue Oct 30 20:45:50 2018 +
Update translations for liveusb-creator
---
el/el.po | 86
1 file changed, 43 insertions(+), 43 deletions(-)
commit 02b69e8b4f87be995937f8a73c67c0d1b0b91221
Author: Damian Johnson
Date: Tue Oct 30 13:44:44 2018 -0700
Update Linus' description
Changes per Linus' request.
---
about/en/board.wml | 26 ++
about/en/corepeople.wml | 2 +-
2 files changed, 7
commit cd75dcaaae51fc0f4673101da18e03d41e46ef6a
Author: Translation commit bot
Date: Tue Oct 30 20:45:09 2018 +
Update translations for abouttor-homepage_completed
---
el/aboutTor.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd
commit 18bf8622278805cf43c075885b55b9043ac0d3ff
Author: Translation commit bot
Date: Tue Oct 30 20:45:04 2018 +
Update translations for abouttor-homepage
---
el/aboutTor.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd
index
commit 611bbd6a3e189a1e0e45e98085fdb97c2f6df5ed
Author: Translation commit bot
Date: Tue Oct 30 19:15:19 2018 +
Update translations for donatepages-messagespot
---
locale/tr/LC_MESSAGES/messages.po | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
commit 3e943e3ec0d2711c9eae792239af6c81b568f6d9
Author: Translation commit bot
Date: Tue Oct 30 18:46:55 2018 +
Update translations for tba-android_stringsdtd
---
gl/android_strings.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gl/android_strings.dtd
commit 655667d8192995321904f362ee0aad8aeebc1bfe
Author: Translation commit bot
Date: Tue Oct 30 18:45:35 2018 +
Update translations for https_everywhere
---
gl/https-everywhere.dtd | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gl/https-everywhere.dtd
commit 231c819e0fca90c000649df5af13697a2adacd73
Author: Translation commit bot
Date: Tue Oct 30 17:15:21 2018 +
Update translations for donatepages-messagespot
---
locale/el/LC_MESSAGES/messages.po | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
commit 74543e10f198a15b87a62c537625321785540a6c
Author: Translation commit bot
Date: Tue Oct 30 16:45:20 2018 +
Update translations for donatepages-messagespot
---
locale/el/LC_MESSAGES/messages.po | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
commit af06d70a389b4f5748dbdeb87c75855fbabbc220
Author: Karsten Loesing
Date: Thu Oct 11 12:26:47 2018 +0200
Extend Tor Browser graphs to include update pings.
Implements the second half of #27931 by making the actual code
changes.
---
src/main/R/rserver/graphs.R
commit e7c0c84754a070c09ebef09b4b748dab899f8250
Author: Karsten Loesing
Date: Sat Oct 27 10:01:48 2018 +0200
Handle days without any successful measurements, second attempt.
The earlier fix in 0408b73 was correct and necessary, but not
sufficient. We'll also have to
commit 325daf2cee6a776e501d55592c9d3e8cde50113f
Author: Translation commit bot
Date: Tue Oct 30 16:15:21 2018 +
Update translations for donatepages-messagespot
---
locale/el/LC_MESSAGES/messages.po | 27 ---
1 file changed, 20 insertions(+), 7 deletions(-)
commit 488969fe9c4279477b1ff6da34ccf44ed19da8c7
Merge: 95559279e a61473114
Author: David Goulet
Date: Tue Oct 30 11:43:54 2018 -0400
Merge branch 'tor-github/pr/438' into maint-0.3.5
changes/ticket27838 | 4 ++
src/feature/hs/hs_service.c | 134
commit df78fb24511e890a1a2bf00127db604919bbdc0e
Author: George Kadianakis
Date: Tue Oct 23 16:34:43 2018 +0300
Documentation: Document which descriptor elements are (im)mutable.
---
src/feature/hs/hs_service.h | 58 +
1 file changed, 37
commit 81c466c34abdcaae9ed78958da50148ccf9939f8
Author: David Goulet
Date: Mon Oct 22 16:18:44 2018 -0400
hs-v3: Create desc signing key cert before uploading
Before this commit, we would create the descriptor signing key certificate
when first building the descriptor.
commit aa1ae1343a2e57dc5a7bcd045566a10175acdd10
Merge: 124c43704 488969fe9
Author: David Goulet
Date: Tue Oct 30 11:44:14 2018 -0400
Merge branch 'maint-0.3.5'
changes/ticket27838 | 4 ++
src/feature/hs/hs_service.c | 134
commit a614731144be9478617411bb3268a4fccec506d9
Author: George Kadianakis
Date: Tue Oct 23 16:43:08 2018 +0300
Documentation: Move the hs_service_descriptor_t elements around.
Move the elements around to concentrate mutable and immutable elements
together. This commit changes
commit 29c194e0222a517a55a16fdc2a80a965f406cab8
Author: George Kadianakis
Date: Tue Oct 23 16:35:02 2018 +0300
Func rename: Make it clear that update_all_descriptors() does intro points.
With the new refresh_service_descriptor() function we had both
commit df78fb24511e890a1a2bf00127db604919bbdc0e
Author: George Kadianakis
Date: Tue Oct 23 16:34:43 2018 +0300
Documentation: Document which descriptor elements are (im)mutable.
---
src/feature/hs/hs_service.h | 58 +
1 file changed, 37
commit a614731144be9478617411bb3268a4fccec506d9
Author: George Kadianakis
Date: Tue Oct 23 16:43:08 2018 +0300
Documentation: Move the hs_service_descriptor_t elements around.
Move the elements around to concentrate mutable and immutable elements
together. This commit changes
commit 81c466c34abdcaae9ed78958da50148ccf9939f8
Author: David Goulet
Date: Mon Oct 22 16:18:44 2018 -0400
hs-v3: Create desc signing key cert before uploading
Before this commit, we would create the descriptor signing key certificate
when first building the descriptor.
commit 488969fe9c4279477b1ff6da34ccf44ed19da8c7
Merge: 95559279e a61473114
Author: David Goulet
Date: Tue Oct 30 11:43:54 2018 -0400
Merge branch 'tor-github/pr/438' into maint-0.3.5
changes/ticket27838 | 4 ++
src/feature/hs/hs_service.c | 134
commit df78fb24511e890a1a2bf00127db604919bbdc0e
Author: George Kadianakis
Date: Tue Oct 23 16:34:43 2018 +0300
Documentation: Document which descriptor elements are (im)mutable.
---
src/feature/hs/hs_service.h | 58 +
1 file changed, 37
commit 29c194e0222a517a55a16fdc2a80a965f406cab8
Author: George Kadianakis
Date: Tue Oct 23 16:35:02 2018 +0300
Func rename: Make it clear that update_all_descriptors() does intro points.
With the new refresh_service_descriptor() function we had both
commit 29c194e0222a517a55a16fdc2a80a965f406cab8
Author: George Kadianakis
Date: Tue Oct 23 16:35:02 2018 +0300
Func rename: Make it clear that update_all_descriptors() does intro points.
With the new refresh_service_descriptor() function we had both
commit 488969fe9c4279477b1ff6da34ccf44ed19da8c7
Merge: 95559279e a61473114
Author: David Goulet
Date: Tue Oct 30 11:43:54 2018 -0400
Merge branch 'tor-github/pr/438' into maint-0.3.5
changes/ticket27838 | 4 ++
src/feature/hs/hs_service.c | 134
commit 81c466c34abdcaae9ed78958da50148ccf9939f8
Author: David Goulet
Date: Mon Oct 22 16:18:44 2018 -0400
hs-v3: Create desc signing key cert before uploading
Before this commit, we would create the descriptor signing key certificate
when first building the descriptor.
commit a614731144be9478617411bb3268a4fccec506d9
Author: George Kadianakis
Date: Tue Oct 23 16:43:08 2018 +0300
Documentation: Move the hs_service_descriptor_t elements around.
Move the elements around to concentrate mutable and immutable elements
together. This commit changes
commit d4b407fc1f20fffa2137f86d0a5f6b7d3bf76f4f
Author: Translation commit bot
Date: Tue Oct 30 15:45:21 2018 +
Update translations for donatepages-messagespot
---
locale/el/LC_MESSAGES/messages.po | 32
1 file changed, 32 insertions(+)
diff --git
commit 56f713b8a477b4203f3bfd8f3ad0952706dc9599
Author: David Goulet
Date: Thu Oct 18 11:44:26 2018 -0400
hs-v3: Always generate the descriptor cookie
It won't be used if there are no authorized client configured. We do that so
we can easily support the addition of a client
commit 95559279e15393347c606eaaa323e0b6490782c2
Merge: 6c9d678ff 56f713b8a
Author: David Goulet
Date: Tue Oct 30 11:36:36 2018 -0400
Merge branch 'tor-github/pr/415' into maint-0.3.5
changes/ticket27995 | 4
src/feature/hs/hs_service.c | 10 --
2 files changed, 8
commit 95559279e15393347c606eaaa323e0b6490782c2
Merge: 6c9d678ff 56f713b8a
Author: David Goulet
Date: Tue Oct 30 11:36:36 2018 -0400
Merge branch 'tor-github/pr/415' into maint-0.3.5
changes/ticket27995 | 4
src/feature/hs/hs_service.c | 10 --
2 files changed, 8
commit 56f713b8a477b4203f3bfd8f3ad0952706dc9599
Author: David Goulet
Date: Thu Oct 18 11:44:26 2018 -0400
hs-v3: Always generate the descriptor cookie
It won't be used if there are no authorized client configured. We do that so
we can easily support the addition of a client
commit 56f713b8a477b4203f3bfd8f3ad0952706dc9599
Author: David Goulet
Date: Thu Oct 18 11:44:26 2018 -0400
hs-v3: Always generate the descriptor cookie
It won't be used if there are no authorized client configured. We do that so
we can easily support the addition of a client
commit 124c43704c99a181001d471b8cb2071e66b42597
Merge: 1c5c3f353 95559279e
Author: David Goulet
Date: Tue Oct 30 11:37:44 2018 -0400
Merge branch 'maint-0.3.5'
changes/ticket27995 | 4
src/feature/hs/hs_service.c | 10 --
2 files changed, 8 insertions(+), 6
commit 95559279e15393347c606eaaa323e0b6490782c2
Merge: 6c9d678ff 56f713b8a
Author: David Goulet
Date: Tue Oct 30 11:36:36 2018 -0400
Merge branch 'tor-github/pr/415' into maint-0.3.5
changes/ticket27995 | 4
src/feature/hs/hs_service.c | 10 --
2 files changed, 8
commit 6c9d678ff66d012b4c8009c6ad44409c7368ed69
Author: David Goulet
Date: Tue Oct 30 11:28:53 2018 -0400
hs-v3: Add changes file for 28026
Signed-off-by: David Goulet
---
changes/ticket28026 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/changes/ticket28026
commit d023de945a7037bb4ec66f81aa83588d53184099
Author: Mike Tigas
Date: Fri Oct 12 17:15:11 2018 -0400
tweak manpage bits about v3 onion svc client auth
make a couple things more explicit, like not needing to set
"HiddenServiceAuthorizeClient" & etc
---
doc/tor.1.txt | 34
commit 6c9d678ff66d012b4c8009c6ad44409c7368ed69
Author: David Goulet
Date: Tue Oct 30 11:28:53 2018 -0400
hs-v3: Add changes file for 28026
Signed-off-by: David Goulet
---
changes/ticket28026 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/changes/ticket28026
commit d023de945a7037bb4ec66f81aa83588d53184099
Author: Mike Tigas
Date: Fri Oct 12 17:15:11 2018 -0400
tweak manpage bits about v3 onion svc client auth
make a couple things more explicit, like not needing to set
"HiddenServiceAuthorizeClient" & etc
---
doc/tor.1.txt | 34
commit 6c9d678ff66d012b4c8009c6ad44409c7368ed69
Author: David Goulet
Date: Tue Oct 30 11:28:53 2018 -0400
hs-v3: Add changes file for 28026
Signed-off-by: David Goulet
---
changes/ticket28026 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/changes/ticket28026
commit 1c5c3f353a0324bbc8b5df235999e04d2478c650
Merge: cdb065d6b 6c9d678ff
Author: David Goulet
Date: Tue Oct 30 11:29:30 2018 -0400
Merge branch 'maint-0.3.5'
changes/ticket28026 | 3 +++
doc/tor.1.txt | 34 ++
2 files changed, 25 insertions(+), 12
commit d023de945a7037bb4ec66f81aa83588d53184099
Author: Mike Tigas
Date: Fri Oct 12 17:15:11 2018 -0400
tweak manpage bits about v3 onion svc client auth
make a couple things more explicit, like not needing to set
"HiddenServiceAuthorizeClient" & etc
---
doc/tor.1.txt | 34
commit 3c34000c9c28b6a55e2c4333a5ad0ccf99bd4026
Author: Taylor R Campbell
Date: Fri Oct 19 17:43:17 2018 +
Specify the ED25519-V3 private key format, and explain why it is so.
---
control-spec.txt | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git
commit adf0df1efc8d61a535bef9f71077e5f74b66ccc9
Author: Translation commit bot
Date: Tue Oct 30 15:15:25 2018 +
Update translations for donatepages-messagespot
---
locale/el/LC_MESSAGES/messages.po| 23 +++
locale/es_AR/LC_MESSAGES/messages.po | 2 +-
2 files
commit 509da29317440c20708fe2214d00d5c0f47a5d4b
Author: Translation commit bot
Date: Tue Oct 30 15:15:31 2018 +
Update translations for donatepages-messagespot_completed
---
locale/es_AR/LC_MESSAGES/messages.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
commit 9b72dca953d56636f0434bd67be2ca80422e7c1e
Author: Neel Chauhan
Date: Wed Oct 24 12:20:28 2018 -0400
Add changes file for Bug #28127
---
changes/bug28127 | 7 +++
1 file changed, 7 insertions(+)
diff --git a/changes/bug28127 b/changes/bug28127
new file mode 100644
index
commit 9b72dca953d56636f0434bd67be2ca80422e7c1e
Author: Neel Chauhan
Date: Wed Oct 24 12:20:28 2018 -0400
Add changes file for Bug #28127
---
changes/bug28127 | 7 +++
1 file changed, 7 insertions(+)
diff --git a/changes/bug28127 b/changes/bug28127
new file mode 100644
index
commit cdb065d6b211298efb0be9320fce32d307b79d2c
Merge: 6ba7f9f0a 9b72dca95
Author: David Goulet
Date: Tue Oct 30 10:55:10 2018 -0400
Merge branch 'maint-0.3.5'
changes/bug28127| 7 +++
src/feature/hs/hs_config.c | 30 +++---
commit cd9914d9f91a2fd1f56e1c0f89bee57b9a49bbc6
Author: Neel Chauhan
Date: Wed Oct 24 12:20:10 2018 -0400
Add test for HiddenServiceAuthorizeClient and v3 onion services
---
src/test/test_hs_config.c | 16
1 file changed, 16 insertions(+)
diff --git
commit cd9914d9f91a2fd1f56e1c0f89bee57b9a49bbc6
Author: Neel Chauhan
Date: Wed Oct 24 12:20:10 2018 -0400
Add test for HiddenServiceAuthorizeClient and v3 onion services
---
src/test/test_hs_config.c | 16
1 file changed, 16 insertions(+)
diff --git
commit cd9914d9f91a2fd1f56e1c0f89bee57b9a49bbc6
Author: Neel Chauhan
Date: Wed Oct 24 12:20:10 2018 -0400
Add test for HiddenServiceAuthorizeClient and v3 onion services
---
src/test/test_hs_config.c | 16
1 file changed, 16 insertions(+)
diff --git
commit 82b3a023024755971003f53950d9b6dfbe90f969
Author: Neel Chauhan
Date: Wed Oct 24 12:19:42 2018 -0400
Detect the onion service version and then check for invalid options unless
we have set HiddenServiceVersion
---
src/feature/hs/hs_config.c | 30 +++---
commit 82b3a023024755971003f53950d9b6dfbe90f969
Author: Neel Chauhan
Date: Wed Oct 24 12:19:42 2018 -0400
Detect the onion service version and then check for invalid options unless
we have set HiddenServiceVersion
---
src/feature/hs/hs_config.c | 30 +++---
commit 82b3a023024755971003f53950d9b6dfbe90f969
Author: Neel Chauhan
Date: Wed Oct 24 12:19:42 2018 -0400
Detect the onion service version and then check for invalid options unless
we have set HiddenServiceVersion
---
src/feature/hs/hs_config.c | 30 +++---
commit 9b72dca953d56636f0434bd67be2ca80422e7c1e
Author: Neel Chauhan
Date: Wed Oct 24 12:20:28 2018 -0400
Add changes file for Bug #28127
---
changes/bug28127 | 7 +++
1 file changed, 7 insertions(+)
diff --git a/changes/bug28127 b/changes/bug28127
new file mode 100644
index
commit 16efa1eddfeffac81a2a455cefadb0bbf237a519
Author: Translation commit bot
Date: Tue Oct 30 14:15:20 2018 +
Update translations for donatepages-messagespot
---
locale/es_AR/LC_MESSAGES/messages.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
commit 4c902e017c11253922418f3a2cf306c036449a88
Author: Translation commit bot
Date: Tue Oct 30 14:15:28 2018 +
Update translations for donatepages-messagespot_completed
---
locale/es_AR/LC_MESSAGES/messages.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f
Merge: c4b6b5738 038bc21f8
Author: Nick Mathewson
Date: Tue Oct 30 09:34:04 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2 files changed, 9
commit 97324a731f5cbdfd0a00b852f4388c3dd149c7fa
Merge: ee1cc0fea 7bf9c93ab
Author: Nick Mathewson
Date: Tue Oct 30 09:35:07 2018 -0400
Merge remote-tracking branch 'tor-github/pr/431' into maint-0.3.5
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 19 ---
commit 6ba7f9f0a42ff2a55b2e66998b4ebf55c90b2787
Merge: 30d853a90 3a05b5acd
Author: Nick Mathewson
Date: Tue Oct 30 09:35:11 2018 -0400
Merge branch 'maint-0.3.5'
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 19 ---
2 files changed, 9 insertions(+), 15
commit 80ad15921cef42ac12da356584f217d2ead5cb09
Author: Nick Mathewson
Date: Mon Sep 17 11:50:46 2018 -0400
Remove extraneous argument from Rust protover_compute_vote()
This argument was added to match an older idea for the C api, but we
decided not to do it that way in C.
commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f
Merge: c4b6b5738 038bc21f8
Author: Nick Mathewson
Date: Tue Oct 30 09:34:04 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2 files changed, 9
commit 1cc8c1e8a579e4fad4304d9538bab8d90a8ad32a
Merge: f4d7a7527 038bc21f8
Author: Nick Mathewson
Date: Tue Oct 30 09:34:04 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2 files changed, 9
commit 7bf9c93ab3af5be6f0881d4bc21fd8d72becff96
Merge: 1ae911660 80ad15921
Author: teor
Date: Tue Sep 18 23:32:57 2018 +1000
Merge remote-tracking branch 'nickm/bug27741_033' into bug27741_035
Resolve conflicts due to rustfmt, and run rustfmt on the merged code.
changes/bug27741
commit 3a05b5acdc4a40eae6016ab94067bf5dde92e5fe
Merge: 97324a731 cf2cb783b
Author: Nick Mathewson
Date: Tue Oct 30 09:35:11 2018 -0400
Merge branch 'maint-0.3.4' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 9d9b8a5a06dd25a91f41c49398b18fc9f5064656
Merge: c0d1ba2e9 cf2cb783b
Author: Nick Mathewson
Date: Tue Oct 30 09:34:04 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2 files changed, 9
commit 038bc21f8894043fbdda0cc87adddfbad84f65c4
Merge: 8013e3e8b 80ad15921
Author: Nick Mathewson
Date: Tue Oct 30 09:33:36 2018 -0400
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2
commit 97324a731f5cbdfd0a00b852f4388c3dd149c7fa
Merge: ee1cc0fea 7bf9c93ab
Author: Nick Mathewson
Date: Tue Oct 30 09:35:07 2018 -0400
Merge remote-tracking branch 'tor-github/pr/431' into maint-0.3.5
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 19 ---
commit 038bc21f8894043fbdda0cc87adddfbad84f65c4
Merge: 8013e3e8b 80ad15921
Author: Nick Mathewson
Date: Tue Oct 30 09:33:36 2018 -0400
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2
commit 038bc21f8894043fbdda0cc87adddfbad84f65c4
Merge: 8013e3e8b 80ad15921
Author: Nick Mathewson
Date: Tue Oct 30 09:33:36 2018 -0400
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2
commit 3a05b5acdc4a40eae6016ab94067bf5dde92e5fe
Merge: 97324a731 cf2cb783b
Author: Nick Mathewson
Date: Tue Oct 30 09:35:11 2018 -0400
Merge branch 'maint-0.3.4' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 80ad15921cef42ac12da356584f217d2ead5cb09
Author: Nick Mathewson
Date: Mon Sep 17 11:50:46 2018 -0400
Remove extraneous argument from Rust protover_compute_vote()
This argument was added to match an older idea for the C api, but we
decided not to do it that way in C.
commit 3a05b5acdc4a40eae6016ab94067bf5dde92e5fe
Merge: 97324a731 cf2cb783b
Author: Nick Mathewson
Date: Tue Oct 30 09:35:11 2018 -0400
Merge branch 'maint-0.3.4' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 038bc21f8894043fbdda0cc87adddfbad84f65c4
Merge: 8013e3e8b 80ad15921
Author: Nick Mathewson
Date: Tue Oct 30 09:33:36 2018 -0400
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2
commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f
Merge: c4b6b5738 038bc21f8
Author: Nick Mathewson
Date: Tue Oct 30 09:34:04 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2 files changed, 9
commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f
Merge: c4b6b5738 038bc21f8
Author: Nick Mathewson
Date: Tue Oct 30 09:34:04 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2 files changed, 9
commit 7bf9c93ab3af5be6f0881d4bc21fd8d72becff96
Merge: 1ae911660 80ad15921
Author: teor
Date: Tue Sep 18 23:32:57 2018 +1000
Merge remote-tracking branch 'nickm/bug27741_033' into bug27741_035
Resolve conflicts due to rustfmt, and run rustfmt on the merged code.
changes/bug27741
commit 7bf9c93ab3af5be6f0881d4bc21fd8d72becff96
Merge: 1ae911660 80ad15921
Author: teor
Date: Tue Sep 18 23:32:57 2018 +1000
Merge remote-tracking branch 'nickm/bug27741_033' into bug27741_035
Resolve conflicts due to rustfmt, and run rustfmt on the merged code.
changes/bug27741
commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f
Merge: c4b6b5738 038bc21f8
Author: Nick Mathewson
Date: Tue Oct 30 09:34:04 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2 files changed, 9
commit 80ad15921cef42ac12da356584f217d2ead5cb09
Author: Nick Mathewson
Date: Mon Sep 17 11:50:46 2018 -0400
Remove extraneous argument from Rust protover_compute_vote()
This argument was added to match an older idea for the C api, but we
decided not to do it that way in C.
commit 038bc21f8894043fbdda0cc87adddfbad84f65c4
Merge: 8013e3e8b 80ad15921
Author: Nick Mathewson
Date: Tue Oct 30 09:33:36 2018 -0400
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2
commit 80ad15921cef42ac12da356584f217d2ead5cb09
Author: Nick Mathewson
Date: Mon Sep 17 11:50:46 2018 -0400
Remove extraneous argument from Rust protover_compute_vote()
This argument was added to match an older idea for the C api, but we
decided not to do it that way in C.
commit 97324a731f5cbdfd0a00b852f4388c3dd149c7fa
Merge: ee1cc0fea 7bf9c93ab
Author: Nick Mathewson
Date: Tue Oct 30 09:35:07 2018 -0400
Merge remote-tracking branch 'tor-github/pr/431' into maint-0.3.5
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 19 ---
commit 80ad15921cef42ac12da356584f217d2ead5cb09
Author: Nick Mathewson
Date: Mon Sep 17 11:50:46 2018 -0400
Remove extraneous argument from Rust protover_compute_vote()
This argument was added to match an older idea for the C api, but we
decided not to do it that way in C.
commit 038bc21f8894043fbdda0cc87adddfbad84f65c4
Merge: 8013e3e8b 80ad15921
Author: Nick Mathewson
Date: Tue Oct 30 09:33:36 2018 -0400
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2
commit 038bc21f8894043fbdda0cc87adddfbad84f65c4
Merge: 8013e3e8b 80ad15921
Author: Nick Mathewson
Date: Tue Oct 30 09:33:36 2018 -0400
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2
commit 80ad15921cef42ac12da356584f217d2ead5cb09
Author: Nick Mathewson
Date: Mon Sep 17 11:50:46 2018 -0400
Remove extraneous argument from Rust protover_compute_vote()
This argument was added to match an older idea for the C api, but we
decided not to do it that way in C.
1 - 100 of 162 matches
Mail list logo
