[tor-commits] [tor/master] rust: Remove #[no_mangle]s on two constants.

commit 547c62840e2fc2700ac917dfdc4e6e451e5c1359 Author: Isis Lovecruft Date: Tue Feb 27 21:01:17 2018 + rust: Remove #[no_mangle]s on two constants. These won't/shouldn't ever be called from C, so there's no reason to preserve naming. ---

[tor-commits] [tor/master] rust: Fix typo in name of logged function.

commit 1f8bd93ecbb57eb47c5788f4a4d12f3bdee61b47 Author: Isis Lovecruft Date: Wed Feb 28 23:19:26 2018 + rust: Fix typo in name of logged function. --- src/rust/tor_util/ffi.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Merge remote-tracking branch 'isis/bug23881_r1'

commit d8893bc93c52e1edd0a76b81f5d65bb10d790474 Merge: 3716611fe 1f8bd93ec Author: Nick Mathewson Date: Mon Mar 19 17:20:37 2018 -0400 Merge remote-tracking branch 'isis/bug23881_r1' src/common/log.c | 31 src/common/torlog.h

[tor-commits] [tor/master] allow running protover test with a testing feature flag

commit d4be1b1e76a8f31bfd38109f91cffda949c1ebba Author: Chelsea Holland Komlo Date: Wed Dec 20 00:07:30 2017 -0500 allow running protover test with a testing feature flag --- src/rust/protover/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git

[tor-commits] [tor/master] rust: Remove extra whitespace from a static log/error message.

commit 167da4bc81da7de0214357cbe08404703bc8c86a Author: Isis Lovecruft Date: Tue Feb 27 20:43:54 2018 + rust: Remove extra whitespace from a static log/error message. --- src/rust/tor_log/tor_log.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] cargo fmt fixes

commit cd8bcacfe1053d067127507b4ebd8bd7b33309e9 Author: Chelsea Holland Komlo Date: Mon Nov 27 23:00:33 2017 -0500 cargo fmt fixes --- src/rust/protover/ffi.rs | 8 +--- src/rust/protover/protover.rs | 4 +--- 2 files changed, 6 insertions(+), 6

[tor-commits] [tor/master] remove unnecessary lifetime

commit 510a91af533afb48f9ad8b64d3d2bc4cd707d9b6 Author: Chelsea Holland Komlo Date: Fri Dec 22 00:26:52 2017 -0500 remove unnecessary lifetime --- src/rust/tor_log/tor_log.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] add testing implementation for tor logging

commit 4cdf0c8899796582b058d289bcd21b95dd1bd452 Author: Chelsea Holland Komlo Date: Thu Dec 21 14:47:41 2017 -0500 add testing implementation for tor logging --- src/rust/tor_log/lib.rs | 1 - src/rust/tor_log/tor_log.rs | 121

[tor-commits] [tor/master] fixups from code review

commit d0184963f9731bea82db1958c885ea1e7f7c42d1 Author: Chelsea Holland Komlo Date: Mon Jan 22 18:33:22 2018 -0500 fixups from code review --- src/common/log.c | 8 +++--- src/common/torlog.h | 8 +++--- src/or/main.c | 4

[tor-commits] [tor/master] move macro body to inline rust function

commit 71a53761415885b3d5f290c3996d1f1634364f8e Author: Chelsea Holland Komlo Date: Sat Dec 16 20:22:21 2017 -0500 move macro body to inline rust function --- src/rust/protover/lib.rs | 2 + src/rust/protover/protover.rs | 2 +- src/rust/tor_log/tor_log.rs

[tor-commits] [tor/master] fixups from code review

commit 0e032fe9ea494ab03e5db5ca901ddbddd147eb19 Author: Chelsea Holland Komlo Date: Fri Dec 15 21:23:10 2017 -0500 fixups from code review --- src/rust/tor_log/tor_log.rs | 19 ++- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git

[tor-commits] [tor/master] add minimal rust module for logging to tor's logger

commit 3dfe8e6522460817100582a33a382be3c3efd988 Author: Chelsea Holland Komlo Date: Mon Nov 27 22:59:54 2017 -0500 add minimal rust module for logging to tor's logger Allows an optional no-op for testing purposes --- src/common/log.c |

[tor-commits] [tor/master] Add minimal implementations of functions Rust needs for logging

commit 719db28f54ad1fa957999f2a6256e07bdb412e4f Author: Nick Mathewson Date: Mon Nov 20 16:52:55 2017 -0500 Add minimal implementations of functions Rust needs for logging --- src/common/log.c| 24 src/common/torlog.h | 4 2 files

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

commit 910422e8fae173f061d016c72eecc2015a09537e Merge: 85719b79b 66d312063 Author: Nick Mathewson Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

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

commit 19421ffcf3fef22bd221279afceb137354d0a3bf Merge: f5f4a6861 910422e8f Author: Nick Mathewson Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

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

commit 910422e8fae173f061d016c72eecc2015a09537e Merge: 85719b79b 66d312063 Author: Nick Mathewson Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

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

commit 3716611fea1c400e80ab3cfd19c588e32b1c005c Merge: bc5f79b95 910422e8f Author: Nick Mathewson Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.3' src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] tests: Fix HS test against max IP lifetime.

commit 66d3120634ad3daffc3394b05ad5f9ef9716c18a Author: Isis Lovecruft Date: Mon Mar 19 19:01:17 2018 + tests: Fix HS test against max IP lifetime. * FIXES part of #25450: https://bugs.torproject.org/25450 --- src/test/test_hs_service.c | 4 +++- 1 file

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

commit 109c555e9d70dca4c4106d6d9fa0dcebdf0ff7ad Merge: 36154c13f 66d312063 Author: Nick Mathewson Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.2] tests: Fix HS test against max IP lifetime.

commit 66d3120634ad3daffc3394b05ad5f9ef9716c18a Author: Isis Lovecruft Date: Mon Mar 19 19:01:17 2018 + tests: Fix HS test against max IP lifetime. * FIXES part of #25450: https://bugs.torproject.org/25450 --- src/test/test_hs_service.c | 4 +++- 1 file

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

commit 910422e8fae173f061d016c72eecc2015a09537e Merge: 85719b79b 66d312063 Author: Nick Mathewson Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.2] tests: Fix HS test against max IP lifetime.

commit 66d3120634ad3daffc3394b05ad5f9ef9716c18a Author: Isis Lovecruft Date: Mon Mar 19 19:01:17 2018 + tests: Fix HS test against max IP lifetime. * FIXES part of #25450: https://bugs.torproject.org/25450 --- src/test/test_hs_service.c | 4 +++- 1 file

[tor-commits] [tor/release-0.3.3] tests: Fix HS test against max IP lifetime.

commit 66d3120634ad3daffc3394b05ad5f9ef9716c18a Author: Isis Lovecruft Date: Mon Mar 19 19:01:17 2018 + tests: Fix HS test against max IP lifetime. * FIXES part of #25450: https://bugs.torproject.org/25450 --- src/test/test_hs_service.c | 4 +++- 1 file

[tor-commits] [tor/maint-0.3.3] tests: Fix HS test against max IP lifetime.

commit 66d3120634ad3daffc3394b05ad5f9ef9716c18a Author: Isis Lovecruft Date: Mon Mar 19 19:01:17 2018 + tests: Fix HS test against max IP lifetime. * FIXES part of #25450: https://bugs.torproject.org/25450 --- src/test/test_hs_service.c | 4 +++- 1 file

[tor-commits] [collector/master] Include webstats in create-tarballs.sh.

commit 4e166b7832a8026690950ca8f8e971998b3a0bcb Author: Karsten Loesing Date: Mon Mar 19 20:59:34 2018 +0100 Include webstats in create-tarballs.sh. --- src/main/resources/create-tarballs.sh | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff

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

commit a5872a0256661985e30f4892aa71dca062007f2b Author: Translation commit bot Date: Mon Mar 19 18:16:39 2018 + Update translations for tor-launcher-network-settings_completed --- he/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

commit 93e22f0ef589b1620931567da6ed70b61b74d630 Author: Translation commit bot Date: Mon Mar 19 18:16:34 2018 + Update translations for tor-launcher-network-settings --- he/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

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

commit 778c29ba79bfbfb14fdba36c12cf1683bb1f2e35 Author: Translation commit bot Date: Mon Mar 19 18:16:45 2018 + Update translations for tails-misc --- he.po | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/he.po

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

commit a13673da044b80fc75e1baf722f6c6927dc395a8 Author: Translation commit bot Date: Mon Mar 19 18:16:22 2018 + Update translations for tor-launcher-properties_completed --- he/torlauncher.properties | 14 ++ 1 file changed, 14 insertions(+)

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

commit 6d06752856d83fd60b112096992a348fcd6811ad Author: Translation commit bot Date: Mon Mar 19 18:16:15 2018 + Update translations for tor-launcher-properties --- he/torlauncher.properties | 24 1 file changed, 12 insertions(+), 12

[tor-commits] [tor/master] Use tor_asprintf for in have_enough_mem_for_dircache()

commit bc5f79b95c5f809635bc84dbdd3010350bfbc269 Author: Neel Chauhan Date: Mon Mar 19 12:27:07 2018 -0400 Use tor_asprintf for in have_enough_mem_for_dircache() (Fixes bug 20887) --- changes/bug20887 | 4 src/or/config.c | 15 +++ 2 files

[tor-commits] [collector/master] Bump version to 1.5.1-dev.

commit 88867bf3b4e880478f8392d7f593dbd5ec6c38a2 Author: Karsten Loesing Date: Mon Mar 19 16:26:13 2018 +0100 Bump version to 1.5.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index d7372bc..780f24e

[tor-commits] [collector/release] Bump version to 1.5.0-dev.

commit ef1dfb6d32d5bb42a95052cd44790b6c586f38c9 Author: Karsten Loesing Date: Mon Feb 26 16:24:49 2018 +0100 Bump version to 1.5.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index ff8302b..fb219fa

[tor-commits] [collector/release] Prepare for 1.5.1 release.

commit 60ac1936169e35d598f5bcbdad616dabd656729d Author: Karsten Loesing Date: Mon Mar 19 15:07:21 2018 +0100 Prepare for 1.5.1 release. --- CHANGELOG.md | 5 - build.xml| 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md

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

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 +-

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

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

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

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. ---

[tor-commits] [collector/release] Add bastet to directory authorities to download votes for.

commit 727d4e54ef450204bb9b23404ae2cc9157fea12c Author: Karsten Loesing Date: Wed Mar 7 14:46:50 2018 +0100 Add bastet to directory authorities to download votes for. We did download bastet's votes in the past after reading the consensus. But there

[tor-commits] [collector/release] Describe file protocol for Tor web server logs.

commit 190d90a800394cbe7e494b486e6ac7eac7377783 Author: iwakeh Date: Mon Feb 26 15:24:50 2018 + Describe file protocol for Tor web server logs. Part of task-20234. --- src/main/resources/docs/PROTOCOL | 13 + 1 file changed, 13 insertions(+)

[tor-commits] [collector/master] Prepare for 1.5.1 release.

commit 60ac1936169e35d598f5bcbdad616dabd656729d Author: Karsten Loesing Date: Mon Mar 19 15:07:21 2018 +0100 Prepare for 1.5.1 release. --- CHANGELOG.md | 5 - build.xml| 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md

[tor-commits] [metrics-web/master] Update Onionoo specification to version 5.1.

commit a34a1c8804863877489d59cee27a935bea3e2196 Author: Karsten Loesing Date: Tue Mar 13 17:40:52 2018 +0100 Update Onionoo specification to version 5.1. Also schedule version 6.0 for release in one month. --- src/main/resources/web/jsps/onionoo.jsp | 45

[tor-commits] [metrics-web/master] Fix specified full path of sanitized webstats.

commit acc26196bcac4dc5ce908b1667fc22c677dd97f1 Author: Karsten Loesing Date: Mon Mar 19 14:50:01 2018 +0100 Fix specified full path of sanitized webstats. Also fix path in convert script. Fixes #25525. --- src/main/resources/spec/convert.sh

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

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

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

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(+)

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

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

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

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

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

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] [collector/master] Add a failing test.

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 +-

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

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

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

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. ---

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.9

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  1   2   >