[tor-commits] [tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1463509 - SOCKS support for Alternative Services r=valentin

2018-06-13 Thread gk
commit 8a68f975ee5faa39efa26a79062476ab50dd18ab Author: Patrick McManus Date: Tue May 22 13:50:56 2018 -0400 Bug 1463509 - SOCKS support for Alternative Services r=valentin MozReview-Commit-ID: 1oXnQuzOqsC --HG-- extra : rebase_source :

[tor-commits] [translation/support-https] Update translations for support-https

2018-06-13 Thread translation
commit 5f2cbf6400872fe17fd1077fb8f3d34e7334ded1 Author: Translation commit bot Date: Wed Jun 13 22:19:32 2018 + Update translations for support-https --- ms_MY.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY.json b/ms_MY.json index 625e41dd5..ca2a36388

[tor-commits] [translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed

2018-06-13 Thread translation
commit 4b38ec7b62cc68473d4533c0fcd61d76ad5bf866 Author: Translation commit bot Date: Wed Jun 13 22:17:50 2018 + Update translations for tails-perl5lib_completed --- ms_MY.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ms_MY.po b/ms_MY.po index

[tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib

2018-06-13 Thread translation
commit f6035c3074a4f65ab49d5f9a76b033a52b5bbdb9 Author: Translation commit bot Date: Wed Jun 13 22:17:46 2018 + Update translations for tails-perl5lib --- ms_MY.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ms_MY.po b/ms_MY.po index

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2018-06-13 Thread translation
commit 504a0cda594847ce64f0915f87c395400853e0a6 Author: Translation commit bot Date: Wed Jun 13 22:17:30 2018 + Update translations for torbutton-torbuttondtd --- ms_MY/torbutton.dtd | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2018-06-13 Thread translation
commit 57a1584aee711e9a2ceeb66172852a71c1dd635c Author: Translation commit bot Date: Wed Jun 13 22:17:20 2018 + Update translations for torbutton-torbuttonproperties --- ms_MY/torbutton.properties | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

[tor-commits] [translation/torbutton-torbuttonproperties_completed] Update translations for torbutton-torbuttonproperties_completed

2018-06-13 Thread translation
commit 6f706a894fdca4f63f1427fd815481be86e56e2c Author: Translation commit bot Date: Wed Jun 13 22:17:25 2018 + Update translations for torbutton-torbuttonproperties_completed --- ms_MY/torbutton.properties | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-06-13 Thread translation
commit 9d26921e42fcc7422838ee1cc3e856b61568eea1 Author: Translation commit bot Date: Wed Jun 13 22:16:49 2018 + Update translations for tails-misc --- ms_MY.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ms_MY.po b/ms_MY.po index 70943a311..c5e08997f

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2018-06-13 Thread translation
commit 8f59669743d834d47d001eb0526eb603f7b5ac30 Author: Translation commit bot Date: Wed Jun 13 22:16:44 2018 + Update translations for tor-launcher-network-settings_completed --- ms_MY/network-settings.dtd | 4 1 file changed, 4 insertions(+) diff --git

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2018-06-13 Thread translation
commit b10a201d3a3ecb1915d774df9516651c0e3a99b2 Author: Translation commit bot Date: Wed Jun 13 22:16:38 2018 + Update translations for tor-launcher-network-settings --- ms_MY/network-settings.dtd | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2018-06-13 Thread translation
commit b5788b833cc9ef795d9412ef5703efe6db04369f Author: Translation commit bot Date: Wed Jun 13 22:15:38 2018 + Update translations for https_everywhere_completed --- ms_MY/https-everywhere.dtd | 6 ++ 1 file changed, 6 insertions(+) diff --git a/ms_MY/https-everywhere.dtd

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-06-13 Thread translation
commit 273c9cc024136076f6e9916e7620267df883c809 Author: Translation commit bot Date: Wed Jun 13 22:16:21 2018 + Update translations for tor-launcher-properties --- ms_MY/torlauncher.properties | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2018-06-13 Thread translation
commit 54d914f162619fef300a1b873a4cb6b415576cdc Author: Translation commit bot Date: Wed Jun 13 22:16:26 2018 + Update translations for tor-launcher-properties_completed --- ms_MY/torlauncher.properties | 14 ++ 1 file changed, 14 insertions(+) diff --git

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2018-06-13 Thread translation
commit 1ff7f93983e96aea0a4dd398175d45850e3a6c47 Author: Translation commit bot Date: Wed Jun 13 22:15:46 2018 + Update translations for liveusb-creator --- ms_MY/ms_MY.po | 62 +- 1 file changed, 31 insertions(+), 31 deletions(-)

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2018-06-13 Thread translation
commit d3b60a707ec7189d49abeaef6806b75ae5fc31dd Author: Translation commit bot Date: Wed Jun 13 22:15:30 2018 + Update translations for https_everywhere --- ms_MY/https-everywhere.dtd | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2018-06-13 Thread translation
commit 50dcb4541dc2565af163ca53ba2591328972c7ca Author: Translation commit bot Date: Wed Jun 13 21:15:30 2018 + Update translations for https_everywhere --- hr_HR/https-everywhere.dtd | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git

[tor-commits] [tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 26045: Add new MAR signing keys

2018-06-13 Thread gk
commit 1f78032d48850e0197608ac1d9906a095e2a4c06 Author: Georg Koppen Date: Wed Jun 13 09:03:59 2018 + Bug 26045: Add new MAR signing keys We need to have new MAR singning keys for our watershed update: both keys we shipped so far need to get replaced by news ones, now

[tor-commits] [tor-browser/tor-browser-60.0.1esr-8.0-1] Revert "Bug 23916: Add new MAR signing key"

2018-06-13 Thread gk
commit d77a0ec835e8ee8e4beab614722c02fa7fd96119 Author: Georg Koppen Date: Wed Jun 13 08:58:27 2018 + Revert "Bug 23916: Add new MAR signing key" This reverts commit e984b8c54c7592057c060f7a2e13b378a355b1d0. --- toolkit/mozapps/update/updater/release_primary.der | Bin 1229

[tor-commits] [tor/master] Merge remote-tracking branch 'asn-github/bug26358'

2018-06-13 Thread nickm
commit ed7b13581234c0c1bbef3126f3dba5cd2892f950 Merge: 7cc3cdef2 99974d4c1 Author: Nick Mathewson Date: Wed Jun 13 10:00:37 2018 -0400 Merge remote-tracking branch 'asn-github/bug26358' src/test/test_relaycell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Silence warning of relaycell/circbw tst.

2018-06-13 Thread nickm
commit 99974d4c1e28cb96d82734ef7cf3531576da610a Author: George Kadianakis Date: Wed Jun 13 14:14:17 2018 +0300 Silence warning of relaycell/circbw tst. Shouldn't send RELAY_COMMAND_DATA cell with 0 stream id. --- src/test/test_relaycell.c | 2 +- 1 file changed, 1 insertion(+), 1

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-13 Thread nickm
commit 7e7585d0a193f8ac368705d7028ec4b241fc2afe Merge: 6017447e3 9713ecfc4 Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-13 Thread nickm
commit 049ba66746006e45d8033d8f88f97ba61d8c5631 Merge: 1c80eb92f 6017447e3 Author: Nick Mathewson Date: Wed Jun 13 09:58:05 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-13 Thread nickm
commit 7e7585d0a193f8ac368705d7028ec4b241fc2afe Merge: 6017447e3 9713ecfc4 Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.2] Merge branch 'bug26158_031' into maint-0.3.1

2018-06-13 Thread nickm
commit 94f3007627f4161ca4f1fb5e41f11cc8ff78ca2b Merge: 16381b579 6c35ad08c Author: Nick Mathewson Date: Wed Jun 13 09:58:01 2018 -0400 Merge branch 'bug26158_031' into maint-0.3.1 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-13 Thread nickm
commit 8e99967521b3da49b991d08f19b20a1e4e969490 Merge: c7d2671f7 ca6d289c0 Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-13 Thread nickm
commit 6017447e3ae8f3cd53c7c6fff1f8660c29affde4 Merge: ff70cc84f 94f300762 Author: Nick Mathewson Date: Wed Jun 13 09:58:04 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.2] Fix an extra space in a changes file

2018-06-13 Thread nickm
commit 9713ecfc40c9dafaee5a03e469b0d9d701cc6181 Author: Nick Mathewson Date: Wed Jun 13 09:59:26 2018 -0400 Fix an extra space in a changes file --- changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26158 b/changes/bug26158 index

[tor-commits] [tor/release-0.3.3] Fix an extra space in a changes file

2018-06-13 Thread nickm
commit 9713ecfc40c9dafaee5a03e469b0d9d701cc6181 Author: Nick Mathewson Date: Wed Jun 13 09:59:26 2018 -0400 Fix an extra space in a changes file --- changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26158 b/changes/bug26158 index

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-13 Thread nickm
commit 6017447e3ae8f3cd53c7c6fff1f8660c29affde4 Merge: ff70cc84f 94f300762 Author: Nick Mathewson Date: Wed Jun 13 09:58:04 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-06-13 Thread nickm
commit 25ccecd0f0c72fd6f8e7a7ec1af4dfadac5a46ec Merge: 2e3dce604 6017447e3 Author: Nick Mathewson Date: Wed Jun 13 09:58:04 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-13 Thread nickm
commit c7d2671f78df07bd66b750f05e6a4699dc7e18b2 Merge: 2e71f3ccf 049ba6674 Author: Nick Mathewson Date: Wed Jun 13 09:58:05 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-06-13 Thread nickm
commit 7bcbd49ad824c1c343d7b26ed58d75ce062cb54c Merge: 25ccecd0f 7e7585d0a Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.3] Merge branch 'bug26158_031' into maint-0.3.1

2018-06-13 Thread nickm
commit 94f3007627f4161ca4f1fb5e41f11cc8ff78ca2b Merge: 16381b579 6c35ad08c Author: Nick Mathewson Date: Wed Jun 13 09:58:01 2018 -0400 Merge branch 'bug26158_031' into maint-0.3.1 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.3] Add a missing "return -1" when checking for Ed25519 ID loops

2018-06-13 Thread nickm
commit 6c35ad08cf36d36a5e2ff888cb7dc8c8df5efe10 Author: Nick Mathewson Date: Tue May 22 08:54:17 2018 -0400 Add a missing "return -1" when checking for Ed25519 ID loops Fixes bug 26158; bugfix on 0.3.0.1-alpha. --- changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-13 Thread nickm
commit ca6d289c00e5e18b24c7f463e709125e545d4405 Merge: 049ba6674 7e7585d0a Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2018-06-13 Thread nickm
commit 34ea50b32a189d22df535ba283a1d404a263780b Merge: 03461d5d4 94f300762 Author: Nick Mathewson Date: Wed Jun 13 09:58:04 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.1] Add a missing "return -1" when checking for Ed25519 ID loops

2018-06-13 Thread nickm
commit 6c35ad08cf36d36a5e2ff888cb7dc8c8df5efe10 Author: Nick Mathewson Date: Tue May 22 08:54:17 2018 -0400 Add a missing "return -1" when checking for Ed25519 ID loops Fixes bug 26158; bugfix on 0.3.0.1-alpha. --- changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2018-06-13 Thread nickm
commit 58ac00fce88b70de78c30a5b9ee1db051f2e1c96 Merge: 34ea50b32 9713ecfc4 Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-13 Thread nickm
commit ca6d289c00e5e18b24c7f463e709125e545d4405 Merge: 049ba6674 7e7585d0a Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

2018-06-13 Thread nickm
commit 7cc3cdef2218d5689f2e51ca475b1c21db1359e5 Merge: 286d02995 ca6d289c0 Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.3' changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

[tor-commits] [tor/release-0.3.1] Fix an extra space in a changes file

2018-06-13 Thread nickm
commit 9713ecfc40c9dafaee5a03e469b0d9d701cc6181 Author: Nick Mathewson Date: Wed Jun 13 09:59:26 2018 -0400 Fix an extra space in a changes file --- changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26158 b/changes/bug26158 index

[tor-commits] [tor/master] Fix an extra space in a changes file

2018-06-13 Thread nickm
commit 9713ecfc40c9dafaee5a03e469b0d9d701cc6181 Author: Nick Mathewson Date: Wed Jun 13 09:59:26 2018 -0400 Fix an extra space in a changes file --- changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26158 b/changes/bug26158 index

[tor-commits] [tor/master] Add a missing "return -1" when checking for Ed25519 ID loops

2018-06-13 Thread nickm
commit 6c35ad08cf36d36a5e2ff888cb7dc8c8df5efe10 Author: Nick Mathewson Date: Tue May 22 08:54:17 2018 -0400 Add a missing "return -1" when checking for Ed25519 ID loops Fixes bug 26158; bugfix on 0.3.0.1-alpha. --- changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-13 Thread nickm
commit 049ba66746006e45d8033d8f88f97ba61d8c5631 Merge: 1c80eb92f 6017447e3 Author: Nick Mathewson Date: Wed Jun 13 09:58:05 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

2018-06-13 Thread nickm
commit 286d02995ff593cad9414e6755a94221171d9854 Merge: 76e9de7c6 049ba6674 Author: Nick Mathewson Date: Wed Jun 13 09:58:05 2018 -0400 Merge branch 'maint-0.3.3' changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.2] Add a missing "return -1" when checking for Ed25519 ID loops

2018-06-13 Thread nickm
commit 6c35ad08cf36d36a5e2ff888cb7dc8c8df5efe10 Author: Nick Mathewson Date: Tue May 22 08:54:17 2018 -0400 Add a missing "return -1" when checking for Ed25519 ID loops Fixes bug 26158; bugfix on 0.3.0.1-alpha. --- changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-13 Thread nickm
commit 6017447e3ae8f3cd53c7c6fff1f8660c29affde4 Merge: ff70cc84f 94f300762 Author: Nick Mathewson Date: Wed Jun 13 09:58:04 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/maint-0.3.3] Fix an extra space in a changes file

2018-06-13 Thread nickm
commit 9713ecfc40c9dafaee5a03e469b0d9d701cc6181 Author: Nick Mathewson Date: Wed Jun 13 09:59:26 2018 -0400 Fix an extra space in a changes file --- changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26158 b/changes/bug26158 index

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-13 Thread nickm
commit 7e7585d0a193f8ac368705d7028ec4b241fc2afe Merge: 6017447e3 9713ecfc4 Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-13 Thread nickm
commit 7e7585d0a193f8ac368705d7028ec4b241fc2afe Merge: 6017447e3 9713ecfc4 Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-13 Thread nickm
commit 6017447e3ae8f3cd53c7c6fff1f8660c29affde4 Merge: ff70cc84f 94f300762 Author: Nick Mathewson Date: Wed Jun 13 09:58:04 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/master] Merge branch 'bug26158_031' into maint-0.3.1

2018-06-13 Thread nickm
commit 94f3007627f4161ca4f1fb5e41f11cc8ff78ca2b Merge: 16381b579 6c35ad08c Author: Nick Mathewson Date: Wed Jun 13 09:58:01 2018 -0400 Merge branch 'bug26158_031' into maint-0.3.1 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-13 Thread nickm
commit 6017447e3ae8f3cd53c7c6fff1f8660c29affde4 Merge: ff70cc84f 94f300762 Author: Nick Mathewson Date: Wed Jun 13 09:58:04 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.1] Merge branch 'bug26158_031' into maint-0.3.1

2018-06-13 Thread nickm
commit 94f3007627f4161ca4f1fb5e41f11cc8ff78ca2b Merge: 16381b579 6c35ad08c Author: Nick Mathewson Date: Wed Jun 13 09:58:01 2018 -0400 Merge branch 'bug26158_031' into maint-0.3.1 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-13 Thread nickm
commit 049ba66746006e45d8033d8f88f97ba61d8c5631 Merge: 1c80eb92f 6017447e3 Author: Nick Mathewson Date: Wed Jun 13 09:58:05 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/maint-0.3.2] Add a missing "return -1" when checking for Ed25519 ID loops

2018-06-13 Thread nickm
commit 6c35ad08cf36d36a5e2ff888cb7dc8c8df5efe10 Author: Nick Mathewson Date: Tue May 22 08:54:17 2018 -0400 Add a missing "return -1" when checking for Ed25519 ID loops Fixes bug 26158; bugfix on 0.3.0.1-alpha. --- changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-13 Thread nickm
commit ca6d289c00e5e18b24c7f463e709125e545d4405 Merge: 049ba6674 7e7585d0a Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.3] Add a missing "return -1" when checking for Ed25519 ID loops

2018-06-13 Thread nickm
commit 6c35ad08cf36d36a5e2ff888cb7dc8c8df5efe10 Author: Nick Mathewson Date: Tue May 22 08:54:17 2018 -0400 Add a missing "return -1" when checking for Ed25519 ID loops Fixes bug 26158; bugfix on 0.3.0.1-alpha. --- changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-13 Thread nickm
commit 7e7585d0a193f8ac368705d7028ec4b241fc2afe Merge: 6017447e3 9713ecfc4 Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'bug26158_031' into maint-0.3.1

2018-06-13 Thread nickm
commit 94f3007627f4161ca4f1fb5e41f11cc8ff78ca2b Merge: 16381b579 6c35ad08c Author: Nick Mathewson Date: Wed Jun 13 09:58:01 2018 -0400 Merge branch 'bug26158_031' into maint-0.3.1 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/maint-0.3.1] Fix an extra space in a changes file

2018-06-13 Thread nickm
commit 9713ecfc40c9dafaee5a03e469b0d9d701cc6181 Author: Nick Mathewson Date: Wed Jun 13 09:59:26 2018 -0400 Fix an extra space in a changes file --- changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26158 b/changes/bug26158 index

[tor-commits] [tor/maint-0.3.2] Fix an extra space in a changes file

2018-06-13 Thread nickm
commit 9713ecfc40c9dafaee5a03e469b0d9d701cc6181 Author: Nick Mathewson Date: Wed Jun 13 09:59:26 2018 -0400 Fix an extra space in a changes file --- changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26158 b/changes/bug26158 index

[tor-commits] [tor/maint-0.3.1] Add a missing "return -1" when checking for Ed25519 ID loops

2018-06-13 Thread nickm
commit 6c35ad08cf36d36a5e2ff888cb7dc8c8df5efe10 Author: Nick Mathewson Date: Tue May 22 08:54:17 2018 -0400 Add a missing "return -1" when checking for Ed25519 ID loops Fixes bug 26158; bugfix on 0.3.0.1-alpha. --- changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2

[tor-commits] [tor/maint-0.3.2] Merge branch 'bug26158_031' into maint-0.3.1

2018-06-13 Thread nickm
commit 94f3007627f4161ca4f1fb5e41f11cc8ff78ca2b Merge: 16381b579 6c35ad08c Author: Nick Mathewson Date: Wed Jun 13 09:58:01 2018 -0400 Merge branch 'bug26158_031' into maint-0.3.1 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/maint-0.3.1] Merge branch 'bug26158_031' into maint-0.3.1

2018-06-13 Thread nickm
commit 94f3007627f4161ca4f1fb5e41f11cc8ff78ca2b Merge: 16381b579 6c35ad08c Author: Nick Mathewson Date: Wed Jun 13 09:58:01 2018 -0400 Merge branch 'bug26158_031' into maint-0.3.1 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'bug25686_diagnostic_032' into maint-0.3.2

2018-06-13 Thread nickm
commit ff70cc84f8b00e710171bc988ababc9fe1be88e9 Merge: 53513e4bf faf458006 Author: Nick Mathewson Date: Wed Jun 13 09:56:17 2018 -0400 Merge branch 'bug25686_diagnostic_032' into maint-0.3.2 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-13 Thread nickm
commit 2e71f3ccfee3451263d2ec35343dea3548e7e4b5 Merge: bc5d90423 1c80eb92f Author: Nick Mathewson Date: Wed Jun 13 09:57:10 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c |

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-13 Thread nickm
commit 1c80eb92fa6c5240b1029c5ee1febe2d20b7d882 Merge: 5f39b ff70cc84f Author: Nick Mathewson Date: Wed Jun 13 09:57:10 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c | 8

[tor-commits] [tor/release-0.3.3] Merge branch 'bug25686_diagnostic_032' into maint-0.3.2

2018-06-13 Thread nickm
commit ff70cc84f8b00e710171bc988ababc9fe1be88e9 Merge: 53513e4bf faf458006 Author: Nick Mathewson Date: Wed Jun 13 09:56:17 2018 -0400 Merge branch 'bug25686_diagnostic_032' into maint-0.3.2 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c

[tor-commits] [tor/release-0.3.3] Several attempts to diagnose ticket 25686

2018-06-13 Thread nickm
commit faf45800611a35be6a4e1381818e69852877f62e Author: Nick Mathewson Date: Mon Jun 11 16:14:57 2018 -0400 Several attempts to diagnose ticket 25686 There are a few reasons that relays might be uploading desciptors without saying X-Desc-Gen-Reason: 1. They are running

[tor-commits] [tor/release-0.3.2] Merge branch 'bug25686_diagnostic_032' into maint-0.3.2

2018-06-13 Thread nickm
commit ff70cc84f8b00e710171bc988ababc9fe1be88e9 Merge: 53513e4bf faf458006 Author: Nick Mathewson Date: Wed Jun 13 09:56:17 2018 -0400 Merge branch 'bug25686_diagnostic_032' into maint-0.3.2 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-06-13 Thread nickm
commit 2e3dce604ec8de261763bc49e5117952ab19c93c Merge: c62ab5417 ff70cc84f Author: Nick Mathewson Date: Wed Jun 13 09:57:10 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c |

[tor-commits] [tor/master] Several attempts to diagnose ticket 25686

2018-06-13 Thread nickm
commit faf45800611a35be6a4e1381818e69852877f62e Author: Nick Mathewson Date: Mon Jun 11 16:14:57 2018 -0400 Several attempts to diagnose ticket 25686 There are a few reasons that relays might be uploading desciptors without saying X-Desc-Gen-Reason: 1. They are running

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

2018-06-13 Thread nickm
commit 76e9de7c6d1a22d89053dd4fa8671d5696c52634 Merge: 8c8ed91aa 1c80eb92f Author: Nick Mathewson Date: Wed Jun 13 09:57:10 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c | 8 +++- 3 files

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-13 Thread nickm
commit 1c80eb92fa6c5240b1029c5ee1febe2d20b7d882 Merge: 5f39b ff70cc84f Author: Nick Mathewson Date: Wed Jun 13 09:57:10 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c | 8

[tor-commits] [tor/release-0.3.2] Several attempts to diagnose ticket 25686

2018-06-13 Thread nickm
commit faf45800611a35be6a4e1381818e69852877f62e Author: Nick Mathewson Date: Mon Jun 11 16:14:57 2018 -0400 Several attempts to diagnose ticket 25686 There are a few reasons that relays might be uploading desciptors without saying X-Desc-Gen-Reason: 1. They are running

[tor-commits] [tor/maint-0.3.2] Several attempts to diagnose ticket 25686

2018-06-13 Thread nickm
commit faf45800611a35be6a4e1381818e69852877f62e Author: Nick Mathewson Date: Mon Jun 11 16:14:57 2018 -0400 Several attempts to diagnose ticket 25686 There are a few reasons that relays might be uploading desciptors without saying X-Desc-Gen-Reason: 1. They are running

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-13 Thread nickm
commit 1c80eb92fa6c5240b1029c5ee1febe2d20b7d882 Merge: 5f39b ff70cc84f Author: Nick Mathewson Date: Wed Jun 13 09:57:10 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c | 8

[tor-commits] [tor/master] Merge branch 'bug25686_diagnostic_032' into maint-0.3.2

2018-06-13 Thread nickm
commit ff70cc84f8b00e710171bc988ababc9fe1be88e9 Merge: 53513e4bf faf458006 Author: Nick Mathewson Date: Wed Jun 13 09:56:17 2018 -0400 Merge branch 'bug25686_diagnostic_032' into maint-0.3.2 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c

[tor-commits] [tor/maint-0.3.3] Several attempts to diagnose ticket 25686

2018-06-13 Thread nickm
commit faf45800611a35be6a4e1381818e69852877f62e Author: Nick Mathewson Date: Mon Jun 11 16:14:57 2018 -0400 Several attempts to diagnose ticket 25686 There are a few reasons that relays might be uploading desciptors without saying X-Desc-Gen-Reason: 1. They are running

[tor-commits] [tor/maint-0.3.2] Merge branch 'bug25686_diagnostic_032' into maint-0.3.2

2018-06-13 Thread nickm
commit ff70cc84f8b00e710171bc988ababc9fe1be88e9 Merge: 53513e4bf faf458006 Author: Nick Mathewson Date: Wed Jun 13 09:56:17 2018 -0400 Merge branch 'bug25686_diagnostic_032' into maint-0.3.2 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c

[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug24891'

2018-06-13 Thread nickm
commit 8c8ed91aae24aa1188275dfb6fbd5f6fcbcbe1a8 Merge: 1b04dab60 b7fae0f48 Author: Nick Mathewson Date: Wed Jun 13 09:46:50 2018 -0400 Merge remote-tracking branch 'rl1987/bug24891' changes/bug24891 | 4 src/common/include.am | 10 ++ src/or/include.am | 4

[tor-commits] [tor/master] Heed --disable-unittests properly

2018-06-13 Thread nickm
commit b7fae0f48ce63371cd2454a0b59d423778a2a7c6 Author: rl1987 Date: Sat Jun 2 12:53:04 2018 +0300 Heed --disable-unittests properly --- changes/bug24891 | 4 src/common/include.am | 10 ++ src/or/include.am | 4 src/test/include.am| 11 +--

[tor-commits] [translation/support-tbb] Update translations for support-tbb

2018-06-13 Thread translation
commit 6b0fc688e65962babadb48b4c6b38f8962aa9b20 Author: Translation commit bot Date: Wed Jun 13 10:19:35 2018 + Update translations for support-tbb --- es.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es.json b/es.json index f0999c4e3..7a0545a49 100644

[tor-commits] [translation/support-tbb] Update translations for support-tbb

2018-06-13 Thread translation
commit 1e1198637a5196501f43f9483fa8ad8e016ed539 Author: Translation commit bot Date: Wed Jun 13 09:49:36 2018 + Update translations for support-tbb --- es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es.json b/es.json index afaafca32..f0999c4e3 100644 ---

[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26354'

2018-06-13 Thread gk
commit f606f5d9d55a171e0a6f57ad58e1052c9f7c149d Merge: 3cab74a 17d7ca8 Author: Georg Koppen Date: Wed Jun 13 09:35:34 2018 + Merge remote-tracking branch 'boklm/bug_26354' projects/release/update_responses_config.yml| 3 +-- projects/tor-browser/RelativeLink/start-tor-browser

[tor-commits] [tor-browser-build/master] Bug 26354: check for SSE2 support in start-tor-browser

2018-06-13 Thread gk
commit fb3315fbc961f924012dcf97d346ce9527f85505 Author: Nicolas Vigier Date: Tue Jun 12 20:02:49 2018 +0200 Bug 26354: check for SSE2 support in start-tor-browser --- projects/tor-browser/RelativeLink/start-tor-browser | 5 + 1 file changed, 5 insertions(+) diff --git

[tor-commits] [tor-browser-build/master] Bug 26354: check for SSE2 support before updating Linux users

2018-06-13 Thread gk
commit 17d7ca8fb2be71b72b429c59fed8a10c042a4a49 Author: Nicolas Vigier Date: Tue Jun 12 20:09:56 2018 +0200 Bug 26354: check for SSE2 support before updating Linux users We were setting the minSupportedInstructionSet attribute for the win32 updates only. We now set it on all

[tor-commits] [tor-browser-build/master] Bug 26234: add update_responses option to specify rewrite rules

2018-06-13 Thread gk
commit 3cab74acf8a2f2a311c133544ccc8c00a43e00a2 Author: Nicolas Vigier Date: Mon Jun 11 17:49:03 2018 +0200 Bug 26234: add update_responses option to specify rewrite rules Add the htaccess_rewrite_rules option which can be used to specify rewrite rules to be added to the