[tor-commits] [tor-browser-build/master] Bug 25449: Bump snowflake/go-webrtc for trac 21312

2018-03-19 Thread gk
commit 42720c512520ecef5437d23e405d8ce011764661 Author: Arlo Breault Date: Mon Mar 5 23:32:32 2018 -0500 Bug 25449: Bump snowflake/go-webrtc for trac 21312 --- projects/go-webrtc/config | 2 +- projects/snowflake/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a

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

2018-03-19 Thread gk
commit b8bae5882eac6159c8a6ad466b9dc4a7b18ba27b Merge: 42720c5 35fcafe Author: Georg Koppen Date: Mon Mar 19 08:47:51 2018 + Merge remote-tracking branch 'boklm/bug_16472_v8' keyring/binutils.gpg| Bin 25772 -> 2242 bytes projects/binutils/64bit-fixups.patc

[tor-commits] [tor-browser-build/master] Bug 16472: update binutils to 2.29.1

2018-03-19 Thread gk
commit 35fcafe980c7b86a15ed433fbac31bd143dfa7b3 Author: Nicolas Vigier Date: Wed Feb 14 13:31:29 2018 +0100 Bug 16472: update binutils to 2.29.1 --- keyring/binutils.gpg| Bin 25772 -> 2242 bytes projects/binutils/64bit-fixups.patch| 31 ++-- projec

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2

2018-03-19 Thread nickm
commit a0cc7e9492ca3737d197d5b7ec491f6f00bc9fb5 Merge: d60dc2755 9191d962f Author: Nick Mathewson Date: Mon Mar 19 05:35:39 2018 -0400 Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2

[tor-commits] [tor/release-0.3.3] changes: Fix changes file for bug25450.

2018-03-19 Thread nickm
commit 9191d962f9f6226ae2ded6006571b1e03ab7970f Author: Isis Lovecruft Date: Thu Mar 8 00:47:34 2018 + changes: Fix changes file for bug25450. It didn't like me insulting my patch, I guess. --- changes/bug25450 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --gi

[tor-commits] [tor/maint-0.3.3] test: Increase time limit for IP creation in an HS test.

2018-03-19 Thread nickm
commit 0545f64d24e04a44fc44e67cd23f631fa5b01135 Author: Isis Lovecruft Date: Wed Mar 7 23:50:00 2018 + test: Increase time limit for IP creation in an HS test. This should avoid most intermittent test failures on developer and CI machines, but there could (and probably sho

[tor-commits] [tor/maint-0.3.3] changes: Fix changes file for bug25450.

2018-03-19 Thread nickm
commit 9191d962f9f6226ae2ded6006571b1e03ab7970f Author: Isis Lovecruft Date: Thu Mar 8 00:47:34 2018 + changes: Fix changes file for bug25450. It didn't like me insulting my patch, I guess. --- changes/bug25450 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --gi

[tor-commits] [tor/master] changes: Fix changes file for bug25450.

2018-03-19 Thread nickm
commit 9191d962f9f6226ae2ded6006571b1e03ab7970f Author: Isis Lovecruft Date: Thu Mar 8 00:47:34 2018 + changes: Fix changes file for bug25450. It didn't like me insulting my patch, I guess. --- changes/bug25450 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --gi

[tor-commits] [tor/release-0.3.2] changes: Fix changes file for bug25450.

2018-03-19 Thread nickm
commit 9191d962f9f6226ae2ded6006571b1e03ab7970f Author: Isis Lovecruft Date: Thu Mar 8 00:47:34 2018 + changes: Fix changes file for bug25450. It didn't like me insulting my patch, I guess. --- changes/bug25450 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --gi

[tor-commits] [tor/maint-0.3.2] test: Increase time limit for IP creation in an HS test.

2018-03-19 Thread nickm
commit 0545f64d24e04a44fc44e67cd23f631fa5b01135 Author: Isis Lovecruft Date: Wed Mar 7 23:50:00 2018 + test: Increase time limit for IP creation in an HS test. This should avoid most intermittent test failures on developer and CI machines, but there could (and probably sho

[tor-commits] [tor/master] test: Increase time limit for IP creation in an HS test.

2018-03-19 Thread nickm
commit 0545f64d24e04a44fc44e67cd23f631fa5b01135 Author: Isis Lovecruft Date: Wed Mar 7 23:50:00 2018 + test: Increase time limit for IP creation in an HS test. This should avoid most intermittent test failures on developer and CI machines, but there could (and probably sho

[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2

2018-03-19 Thread nickm
commit a0cc7e9492ca3737d197d5b7ec491f6f00bc9fb5 Merge: d60dc2755 9191d962f Author: Nick Mathewson Date: Mon Mar 19 05:35:39 2018 -0400 Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2

[tor-commits] [tor/release-0.3.3] test: Increase time limit for IP creation in an HS test.

2018-03-19 Thread nickm
commit 0545f64d24e04a44fc44e67cd23f631fa5b01135 Author: Isis Lovecruft Date: Wed Mar 7 23:50:00 2018 + test: Increase time limit for IP creation in an HS test. This should avoid most intermittent test failures on developer and CI machines, but there could (and probably sho

[tor-commits] [tor/maint-0.3.2] changes: Fix changes file for bug25450.

2018-03-19 Thread nickm
commit 9191d962f9f6226ae2ded6006571b1e03ab7970f Author: Isis Lovecruft Date: Thu Mar 8 00:47:34 2018 + changes: Fix changes file for bug25450. It didn't like me insulting my patch, I guess. --- changes/bug25450 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --gi

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

2018-03-19 Thread nickm
commit 296e429ebcb676b39a574bf8e8850c53bb659d74 Merge: f0f2fab5e a0cc7e949 Author: Nick Mathewson Date: Mon Mar 19 05:36:06 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2 files changed, 14 ins

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2

2018-03-19 Thread nickm
commit a0cc7e9492ca3737d197d5b7ec491f6f00bc9fb5 Merge: d60dc2755 9191d962f Author: Nick Mathewson Date: Mon Mar 19 05:35:39 2018 -0400 Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2

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

2018-03-19 Thread nickm
commit 75b544d64da0e273090d2f7ff98a67c9267cc37d Merge: 2f397236b a0cc7e949 Author: Nick Mathewson Date: Mon Mar 19 05:36:06 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2 files changed, 14 i

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

2018-03-19 Thread nickm
commit 296e429ebcb676b39a574bf8e8850c53bb659d74 Merge: f0f2fab5e a0cc7e949 Author: Nick Mathewson Date: Mon Mar 19 05:36:06 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2 files changed, 14 ins

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2

2018-03-19 Thread nickm
commit a0cc7e9492ca3737d197d5b7ec491f6f00bc9fb5 Merge: d60dc2755 9191d962f Author: Nick Mathewson Date: Mon Mar 19 05:35:39 2018 -0400 Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2

[tor-commits] [tor/master] Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2

2018-03-19 Thread nickm
commit a0cc7e9492ca3737d197d5b7ec491f6f00bc9fb5 Merge: d60dc2755 9191d962f Author: Nick Mathewson Date: Mon Mar 19 05:35:39 2018 -0400 Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2

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

2018-03-19 Thread nickm
commit bcea98a4b41f7e54068ad73f50eb5e0ceb593a12 Merge: 4e5e97342 296e429eb Author: Nick Mathewson Date: Mon Mar 19 05:36:06 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2 files changed, 14 insertions(+), 5 del

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

2018-03-19 Thread nickm
commit 296e429ebcb676b39a574bf8e8850c53bb659d74 Merge: f0f2fab5e a0cc7e949 Author: Nick Mathewson Date: Mon Mar 19 05:36:06 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2 files changed, 14 ins

[tor-commits] [tor/release-0.3.2] test: Increase time limit for IP creation in an HS test.

2018-03-19 Thread nickm
commit 0545f64d24e04a44fc44e67cd23f631fa5b01135 Author: Isis Lovecruft Date: Wed Mar 7 23:50:00 2018 + test: Increase time limit for IP creation in an HS test. This should avoid most intermittent test failures on developer and CI machines, but there could (and probably sho

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

2018-03-19 Thread nickm
commit f5f377ecb219d45c01dc24de90f7fc7b180128e0 Merge: 5ee93047c 296e429eb Author: Nick Mathewson Date: Mon Mar 19 05:36:06 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2 files changed, 14 i

[tor-commits] [tor/master] tests: Fix crash on win32 due to uninitialised mutex in bench.c.

2018-03-19 Thread nickm
commit 53914f7dae6ad01e6413329271664ea9031385c0 Author: Gisle Vanem Date: Tue Mar 13 23:19:55 2018 + tests: Fix crash on win32 due to uninitialised mutex in bench.c. Signed-off-by: Isis Lovecruft --- src/test/bench.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/t

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

2018-03-19 Thread nickm
commit 92c60b572ce89e6988422df81af7e8fbcbf2d102 Merge: bcea98a4b 9d1c7c3a8 Author: Nick Mathewson Date: Mon Mar 19 05:39:56 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25479 | 4 src/test/bench.c | 2 ++ 2 files changed, 6 insertions(+) _

[tor-commits] [tor/release-0.3.3] changes: Add changes file for bug25479.

2018-03-19 Thread nickm
commit 9d1c7c3a8aea7ba423c89456ff0b065d109330d4 Author: Isis Lovecruft Date: Tue Mar 13 23:40:15 2018 + changes: Add changes file for bug25479. --- changes/bug25479 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug25479 b/changes/bug25479 new file mode 100644 index 00

[tor-commits] [tor/release-0.3.3] tests: Fix crash on win32 due to uninitialised mutex in bench.c.

2018-03-19 Thread nickm
commit 53914f7dae6ad01e6413329271664ea9031385c0 Author: Gisle Vanem Date: Tue Mar 13 23:19:55 2018 + tests: Fix crash on win32 due to uninitialised mutex in bench.c. Signed-off-by: Isis Lovecruft --- src/test/bench.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/t

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

2018-03-19 Thread nickm
commit 3bda8ab0aeb15cabbee3f184cad0f3d7f81c205b Merge: f5f377ecb 9d1c7c3a8 Author: Nick Mathewson Date: Mon Mar 19 05:39:56 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25479 | 4 src/test/bench.c | 2 ++ 2 files changed, 6 insertions(+) __

[tor-commits] [tor/maint-0.3.3] tests: Fix crash on win32 due to uninitialised mutex in bench.c.

2018-03-19 Thread nickm
commit 53914f7dae6ad01e6413329271664ea9031385c0 Author: Gisle Vanem Date: Tue Mar 13 23:19:55 2018 + tests: Fix crash on win32 due to uninitialised mutex in bench.c. Signed-off-by: Isis Lovecruft --- src/test/bench.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/t

[tor-commits] [tor/maint-0.3.3] changes: Add changes file for bug25479.

2018-03-19 Thread nickm
commit 9d1c7c3a8aea7ba423c89456ff0b065d109330d4 Author: Isis Lovecruft Date: Tue Mar 13 23:40:15 2018 + changes: Add changes file for bug25479. --- changes/bug25479 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug25479 b/changes/bug25479 new file mode 100644 index 00

[tor-commits] [tor/master] changes: Add changes file for bug25479.

2018-03-19 Thread nickm
commit 9d1c7c3a8aea7ba423c89456ff0b065d109330d4 Author: Isis Lovecruft Date: Tue Mar 13 23:40:15 2018 + changes: Add changes file for bug25479. --- changes/bug25479 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug25479 b/changes/bug25479 new file mode 100644 index 00

[tor-commits] [tor/maint-0.3.3] Document how to allow partial Travis failures

2018-03-19 Thread nickm
commit 09484b944993f4b8d0a43ecedabeb2c86f889b77 Author: Taylor Yu Date: Wed Feb 28 12:28:45 2018 -0600 Document how to allow partial Travis failures Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still

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

2018-03-19 Thread nickm
commit 3370b3cfef62cba8377285d95b232f810edde504 Merge: 67a313f0e 0eb2cdf99 Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) __

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

2018-03-19 Thread nickm
commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+),

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

2018-03-19 Thread nickm
commit 1aa0ae2cc3547a35a44967ed56c1f78a42c076f8 Merge: 0e7f15fdb 3370b3cfe Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) diff --cc .travis

[tor-commits] [tor/maint-0.3.2] Document how to allow partial Travis failures

2018-03-19 Thread nickm
commit 09484b944993f4b8d0a43ecedabeb2c86f889b77 Author: Taylor Yu Date: Wed Feb 28 12:28:45 2018 -0600 Document how to allow partial Travis failures Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still

[tor-commits] [tor/master] Document how to allow partial Travis failures

2018-03-19 Thread nickm
commit 09484b944993f4b8d0a43ecedabeb2c86f889b77 Author: Taylor Yu Date: Wed Feb 28 12:28:45 2018 -0600 Document how to allow partial Travis failures Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still

[tor-commits] [tor/maint-0.2.9] Document how to allow partial Travis failures

2018-03-19 Thread nickm
commit 09484b944993f4b8d0a43ecedabeb2c86f889b77 Author: Taylor Yu Date: Wed Feb 28 12:28:45 2018 -0600 Document how to allow partial Travis failures Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still

[tor-commits] [tor/maint-0.2.5] Document how to allow partial Travis failures

2018-03-19 Thread nickm
commit 09484b944993f4b8d0a43ecedabeb2c86f889b77 Author: Taylor Yu Date: Wed Feb 28 12:28:45 2018 -0600 Document how to allow partial Travis failures Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9

2018-03-19 Thread nickm
commit 3370b3cfef62cba8377285d95b232f810edde504 Merge: 67a313f0e 0eb2cdf99 Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) _

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

2018-03-19 Thread nickm
commit 1aa0ae2cc3547a35a44967ed56c1f78a42c076f8 Merge: 0e7f15fdb 3370b3cfe Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) diff --cc .travis

[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

2018-03-19 Thread nickm
commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+),

[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

2018-03-19 Thread nickm
commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+),

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

2018-03-19 Thread nickm
commit bc0de600b2033c6fb109d70ff3cbd8b8dc2ad271 Merge: a0cc7e949 1aa0ae2cc Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) ___

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

2018-03-19 Thread nickm
commit 85719b79b71eb5a4ef889272a393aa97bbc86134 Merge: 9d1c7c3a8 bc0de600b Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) _

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

2018-03-19 Thread nickm
commit 3370b3cfef62cba8377285d95b232f810edde504 Merge: 67a313f0e 0eb2cdf99 Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) __

[tor-commits] [tor/maint-0.3.1] Document how to allow partial Travis failures

2018-03-19 Thread nickm
commit 09484b944993f4b8d0a43ecedabeb2c86f889b77 Author: Taylor Yu Date: Wed Feb 28 12:28:45 2018 -0600 Document how to allow partial Travis failures Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still

[tor-commits] [tor/maint-0.2.5] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

2018-03-19 Thread nickm
commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+),

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

2018-03-19 Thread nickm
commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+),

[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

2018-03-19 Thread nickm
commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+),

[tor-commits] [tor/release-0.3.1] Document how to allow partial Travis failures

2018-03-19 Thread nickm
commit 09484b944993f4b8d0a43ecedabeb2c86f889b77 Author: Taylor Yu Date: Wed Feb 28 12:28:45 2018 -0600 Document how to allow partial Travis failures Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still

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

2018-03-19 Thread nickm
commit 3370b3cfef62cba8377285d95b232f810edde504 Merge: 67a313f0e 0eb2cdf99 Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) __

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

2018-03-19 Thread nickm
commit 3370b3cfef62cba8377285d95b232f810edde504 Merge: 67a313f0e 0eb2cdf99 Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) __

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

2018-03-19 Thread nickm
commit 0945235ff84a59fcb1bb13760aa1966f341ac6b8 Merge: 164263fc5 3370b3cfe Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) ___

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

2018-03-19 Thread nickm
commit 3370b3cfef62cba8377285d95b232f810edde504 Merge: 67a313f0e 0eb2cdf99 Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) __

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.9

2018-03-19 Thread nickm
commit 3370b3cfef62cba8377285d95b232f810edde504 Merge: 67a313f0e 0eb2cdf99 Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) __

[tor-commits] [tor/release-0.2.5] Document how to allow partial Travis failures

2018-03-19 Thread nickm
commit 09484b944993f4b8d0a43ecedabeb2c86f889b77 Author: Taylor Yu Date: Wed Feb 28 12:28:45 2018 -0600 Document how to allow partial Travis failures Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still

[tor-commits] [tor/release-0.3.2] Document how to allow partial Travis failures

2018-03-19 Thread nickm
commit 09484b944993f4b8d0a43ecedabeb2c86f889b77 Author: Taylor Yu Date: Wed Feb 28 12:28:45 2018 -0600 Document how to allow partial Travis failures Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still

[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

2018-03-19 Thread nickm
commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+),

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

2018-03-19 Thread nickm
commit bc0de600b2033c6fb109d70ff3cbd8b8dc2ad271 Merge: a0cc7e949 1aa0ae2cc Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) _

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

2018-03-19 Thread nickm
commit 1aa0ae2cc3547a35a44967ed56c1f78a42c076f8 Merge: 0e7f15fdb 3370b3cfe Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) diff --cc .travis

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

2018-03-19 Thread nickm
commit 1d281eb933d6cf51d8a488bface6bf3f0a963f4f Merge: 0d63a6064 0eb2cdf99 Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) ___

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

2018-03-19 Thread nickm
commit 267671bdaaa079e0c1757ad689f7c54f24ac71ab Merge: 92c60b572 85719b79b Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.3' .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) __

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

2018-03-19 Thread nickm
commit bc0de600b2033c6fb109d70ff3cbd8b8dc2ad271 Merge: a0cc7e949 1aa0ae2cc Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) ___

[tor-commits] [tor/release-0.2.9] Document how to allow partial Travis failures

2018-03-19 Thread nickm
commit 09484b944993f4b8d0a43ecedabeb2c86f889b77 Author: Taylor Yu Date: Wed Feb 28 12:28:45 2018 -0600 Document how to allow partial Travis failures Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still

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

2018-03-19 Thread nickm
commit 72db4f836ac86759e69bac3e2b310cc1ca5ba81a Merge: 35179a8c0 1aa0ae2cc Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) ___

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

2018-03-19 Thread nickm
commit 1aa0ae2cc3547a35a44967ed56c1f78a42c076f8 Merge: 0e7f15fdb 3370b3cfe Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) diff --cc .travis

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

2018-03-19 Thread nickm
commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+),

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

2018-03-19 Thread nickm
commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+),

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

2018-03-19 Thread nickm
commit f5f4a68610c7e17d3f8a600d7be412b7c463528a Merge: 3bda8ab0a 85719b79b Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) ___

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

2018-03-19 Thread nickm
commit 3370b3cfef62cba8377285d95b232f810edde504 Merge: 67a313f0e 0eb2cdf99 Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) __

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

2018-03-19 Thread nickm
commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+),

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

2018-03-19 Thread nickm
commit 85719b79b71eb5a4ef889272a393aa97bbc86134 Merge: 9d1c7c3a8 bc0de600b Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) __

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

2018-03-19 Thread nickm
commit 1aa0ae2cc3547a35a44967ed56c1f78a42c076f8 Merge: 0e7f15fdb 3370b3cfe Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) diff --cc .travis

[tor-commits] [tor/release-0.3.3] Document how to allow partial Travis failures

2018-03-19 Thread nickm
commit 09484b944993f4b8d0a43ecedabeb2c86f889b77 Author: Taylor Yu Date: Wed Feb 28 12:28:45 2018 -0600 Document how to allow partial Travis failures Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still

[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

2018-03-19 Thread nickm
commit 0eb2cdf99de77556fce549ba856887d5852a034b Merge: 3418a3a7f 09484b944 Author: Nick Mathewson Date: Mon Mar 19 05:42:38 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 .travis.yml | 24 1 file changed, 20 insertions(+),

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

2018-03-19 Thread nickm
commit 1aa0ae2cc3547a35a44967ed56c1f78a42c076f8 Merge: 0e7f15fdb 3370b3cfe Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) diff --cc .travis

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

2018-03-19 Thread nickm
commit 1aa0ae2cc3547a35a44967ed56c1f78a42c076f8 Merge: 0e7f15fdb 3370b3cfe Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) diff --cc .travis

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

2018-03-19 Thread nickm
commit bc0de600b2033c6fb109d70ff3cbd8b8dc2ad271 Merge: a0cc7e949 1aa0ae2cc Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) ___

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

2018-03-19 Thread nickm
commit 3370b3cfef62cba8377285d95b232f810edde504 Merge: 67a313f0e 0eb2cdf99 Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) __

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

2018-03-19 Thread nickm
commit bc0de600b2033c6fb109d70ff3cbd8b8dc2ad271 Merge: a0cc7e949 1aa0ae2cc Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) ___

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

2018-03-19 Thread nickm
commit 36154c13f41f517c7629613d4b58cde23bb9ee1a Merge: 75b544d64 bc0de600b Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) ___

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

2018-03-19 Thread nickm
commit 85719b79b71eb5a4ef889272a393aa97bbc86134 Merge: 9d1c7c3a8 bc0de600b Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) __

[tor-commits] [tor/master] cmux: Rename cell_ewma_set_scale_factor()

2018-03-19 Thread nickm
commit 9af5b625e8be64ed63ad5b19ae6c4b450e977ce0 Author: David Goulet Date: Thu Feb 15 13:51:34 2018 -0500 cmux: Rename cell_ewma_set_scale_factor() It is rename to something more meaningful that explains what it does exactly which is sets the EWMA options (currently only one ex

[tor-commits] [tor/master] cmux: Make EWMA policy mandatory

2018-03-19 Thread nickm
commit 6b1dba214db3058b143bbb4d4c4bdfee32d100f1 Author: David Goulet Date: Thu Feb 15 13:45:21 2018 -0500 cmux: Make EWMA policy mandatory To achieve this, a default value for the CircuitPriorityHalflife option was needed. We still look in the options and then the consensus but

[tor-commits] [tor/master] cmux: Remove round-robin circuit policy

2018-03-19 Thread nickm
commit c235c32bbcd33351d0d720fe2fb3dbac6369d12c Author: David Goulet Date: Thu Feb 15 14:23:36 2018 -0500 cmux: Remove round-robin circuit policy Since 0.2.4, tor uses EWMA circuit policy to prioritize. The previous algorithm, round-robin, hasn't been used since then but was st

[tor-commits] [tor/master] man: Update the CircuitPriorityHalflife entry

2018-03-19 Thread nickm
commit 779eded6bb227c0f315d59921636185f20b1d3e6 Author: David Goulet Date: Thu Feb 15 14:53:10 2018 -0500 man: Update the CircuitPriorityHalflife entry The behavior has changed slightly in the previous commits. Signed-off-by: David Goulet --- doc/tor.1.txt | 20 +++

[tor-commits] [tor/master] add a changes file for 25268

2018-03-19 Thread nickm
commit 4449c9e8fe7b11ec816762c8b37b1ed70d873d4a Author: Nick Mathewson Date: Mon Mar 19 06:00:00 2018 -0400 add a changes file for 25268 --- changes/ticket25268 | 7 +++ 1 file changed, 7 insertions(+) diff --git a/changes/ticket25268 b/changes/ticket25268 new file mode 100644 index 0

[tor-commits] [tor/master] cmux: Remove PARANOIA assert functions

2018-03-19 Thread nickm
commit 9d68647ba3fc0774653be7ac994f8a6307b146f9 Author: David Goulet Date: Thu Feb 15 13:59:51 2018 -0500 cmux: Remove PARANOIA assert functions The reason to do so is because these functions haven't been used in years so since 0.2.4, every callsite is NOP. In future c

[tor-commits] [tor/master] Merge branch 'ticket25268_034_01'

2018-03-19 Thread nickm
commit a324cd9020b3f088c90091f0b57292bd23072f2b Merge: 267671bda 4449c9e8f Author: Nick Mathewson Date: Mon Mar 19 06:01:02 2018 -0400 Merge branch 'ticket25268_034_01' changes/ticket25268 | 7 + doc/tor.1.txt | 18 +- src/or/channel.c| 15 - src/or/c

[tor-commits] [tor/master] cmux: Always use the cmux policy

2018-03-19 Thread nickm
commit e19cd38f08a67ed6bfb6f9ab174c134c41885af4 Author: David Goulet Date: Thu Feb 15 14:34:53 2018 -0500 cmux: Always use the cmux policy Remove the checks on cmux->policy since it should always be set. Signed-off-by: David Goulet --- src/or/circuitmux.c | 10 ++

[tor-commits] [collector/master] Add lines according to their count.

2018-03-19 Thread karsten
commit 2c00f28ab7eaba0310d2d96eda7f81f2a301a4a5 Author: iwakeh Date: Wed Mar 7 13:46:54 2018 + Add lines according to their count. Making the test from the previous commit pass and fixing task-25522. --- src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java | 3

[tor-commits] [collector/master] Avoid calling bytesFor() unnecessarily.

2018-03-19 Thread karsten
commit 8c1bdd9a8403a0a19149b6388bbc940ee632eaae Author: Karsten Loesing Date: Sat Mar 17 10:45:55 2018 +0100 Avoid calling bytesFor() unnecessarily. Found while looking into #25522. --- src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java | 5 - 1 file changed,

[tor-commits] [collector/master] Add a failing test.

2018-03-19 Thread karsten
commit 2e6fa506b3c9634837e6da4c8ad3dbf477936232 Author: iwakeh Date: Wed Mar 7 13:46:51 2018 + Add a failing test. Making a static method easier accessible for tests. --- .../collector/webstats/SanitizeWeblogs.java | 2 +- .../collector/webstats/SanitizeWeblogsTest.j

[tor-commits] [tor/master] Merge remote-tracking branch 'fristonio/ticket-6236'

2018-03-19 Thread nickm
commit b0f0c0f5505b3cf4cfbd4a3c1908ace4740f343b Merge: a324cd902 130e2ffad Author: Nick Mathewson Date: Mon Mar 19 06:42:10 2018 -0400 Merge remote-tracking branch 'fristonio/ticket-6236' changes/ticket6236 | 4 ++ src/or/transports.c | 182 -

[tor-commits] [tor/master] Remove duplicate code between parse_{c, s}method in transport.c

2018-03-19 Thread nickm
commit 130e2ffad74c04dbb2acaf94eb2be3879f6a898d Author: Deepesh Pathak Date: Sat Feb 24 20:27:08 2018 +0530 Remove duplicate code between parse_{c,s}method in transport.c - Merged common code in function parse_{c,s}method to a single function - Removed duplicate code in transpo

[tor-commits] [metrics-lib/master] Add change log entry for #25526.

2018-03-19 Thread karsten
commit 2e235ef8f38aac679817fa8e8b9171aadb3d5b9d Author: Karsten Loesing Date: Mon Mar 19 11:58:37 2018 +0100 Add change log entry for #25526. --- CHANGELOG.md | 7 +++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d87ba4..d8576e3 100644 --- a/CHANGELO

[tor-commits] [metrics-lib/master] Override logLines method from LogDescriptor.

2018-03-19 Thread karsten
commit c54b264ad865d522bceb135d0fd0ab6b116e5f81 Author: iwakeh Date: Mon Feb 26 15:24:26 2018 + Override logLines method from LogDescriptor. --- .../java/org/torproject/descriptor/WebServerAccessLog.java | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/

[tor-commits] [torspec/master] Fix an ambiguity in the grammar for Document.

2018-03-19 Thread nickm
commit 3e533e974b15d0ad71dca9466efef81f977e6859 Author: Nick Mathewson Date: Mon Mar 19 09:06:19 2018 -0400 Fix an ambiguity in the grammar for Document. Previously, a BEGIN/END block might be interpreted as starting with the keyword "-BEGIN". This change specifically disa

  1   2   >