[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/287'

commit e619fd02ef9a9926731244b2b19024a04f93fd5a Merge: 05cd3224a 3bf4493cb Author: Nick Mathewson Date: Tue Aug 21 20:08:55 2018 -0400 Merge remote-tracking branch 'tor-github/pr/287' src/test/test_address.c | 1 - 1 file changed, 1 deletion(-)

[tor-commits] [tor/master] Remove duplicate include in src/test/test_address.c

commit 3bf4493cb9d400cf5cda864339de98dd3bf832e1 Author: Neel Chauhan Date: Tue Aug 21 20:01:48 2018 -0400 Remove duplicate include in src/test/test_address.c --- src/test/test_address.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_address.c b/src/test/test_address.c

[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-032' into travis-osx-033

commit 6463cdea55bbeb711a10153156a4b93f2471d034 Merge: ed1210d0f e2eec40c4 Author: teor Date: Fri Aug 10 19:06:32 2018 +1000 Merge branch 'travis-osx-032' into travis-osx-033 .travis.yml | 1 + 1 file changed, 1 insertion(+) ___ tor-commits

[tor-commits] [tor/release-0.3.4] Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4

commit 546c134801a17ebb63032b5ac52a65279998ea6f Author: teor Date: Fri Aug 10 13:11:27 2018 +1000 Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4 Re-applies 0.3.3 changes after 24629. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.4] Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later

commit a544af818671eae8f265c687e24349061d3b8450 Author: teor Date: Fri Aug 10 11:55:50 2018 +1000 Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later TOR_RUST_DEPENDENCIES used to be spelt RUST_DEPENDENCIES in 0.3.2. Re-applies 0.3.3 changes after 24629. ---

[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2

commit a29e9a901d196243791f9210be1fed1c177521df Merge: d52f40600 e2eec40c4 Author: Nick Mathewson Date: Tue Aug 21 20:03:41 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2 .travis.yml | 253 ++-

[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4

commit aac1e17f22acfc7338ec5290db55fbbfd8ddfdbf Merge: f68aab83b c28da0d8e Author: Nick Mathewson Date: Tue Aug 21 20:04:03 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4 .travis.yml | 276 ---

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

commit 3cfceeb45d51f8f3c4960cabaad1849dcecb14a3 Merge: f0633bc49 a5bbe3f1d Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946 Merge: a29e9a901 05d62a3b7 Author: Nick Mathewson Date: Tue Aug 21 20:03:46 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-033' into travis-osx-034

commit 6e0be81211d7f9251231468c50b696aac2f8c9a1 Merge: 0f0dac0bf e1291aa84 Author: teor Date: Fri Aug 10 13:15:16 2018 +1000 Merge branch 'travis-osx-033' into travis-osx-034 Replace 034 .travis.yml with 033 .travis.yml. Subsequent commits will restore 034 functionality.

[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9

commit 05d62a3b73ed092ec1643ead56d775bb5d06f648 Merge: 85a879234 d514e9866 Author: Nick Mathewson Date: Tue Aug 21 20:03:19 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9 .travis.yml| 213 ++---

[tor-commits] [tor/release-0.3.4] Travis: add a missing macOS asciidoc dependency

commit e78f9c5dfb55e71fa79c152d13a1ff72fd907040 Author: teor Date: Fri Aug 10 16:24:31 2018 +1000 Travis: add a missing macOS asciidoc dependency --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7583eb749..eed137181 100644 ---

[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-033' into travis-osx-034

commit c28da0d8e105515bafdb8a9710ab965a51b3c4eb Merge: a1c110a2a 6463cdea5 Author: teor Date: Fri Aug 10 19:06:45 2018 +1000 Merge branch 'travis-osx-033' into travis-osx-034 .travis.yml | 1 + 1 file changed, 1 insertion(+) ___ tor-commits

[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-033' into travis-osx-034

commit a1c110a2a478d3fae50871741d52659cc34f4623 Merge: 2a33edc59 ed1210d0f Author: teor Date: Fri Aug 10 16:41:27 2018 +1000 Merge branch 'travis-osx-033' into travis-osx-034 Take the asciidoc changes from 033, and the module changes from 034. .travis.yml | 1 + 1 file

[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3

commit f0633bc49164a10ca163aa94139222682af376f7 Merge: 245025a3d 6463cdea5 Author: Nick Mathewson Date: Tue Aug 21 20:03:56 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3 .travis.yml | 262 +--

[tor-commits] [tor/release-0.3.4] Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4

commit e1291aa84a04b8006130ce08338ee07a662e5ce0 Author: teor Date: Fri Aug 10 13:11:27 2018 +1000 Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4 Re-applies 0.3.3 changes after 24629. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.4] Travis: add a missing macOS asciidoc env var

commit d514e98663fbac3107d02f492fbff9d6018c275d Author: teor Date: Fri Aug 10 18:26:33 2018 +1000 Travis: add a missing macOS asciidoc env var --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index eed137181..8b8621007 100644 --- a/.travis.yml

[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-029' into travis-osx-032

commit e2eec40c4469c10dfb3006dfb07240d7e1144aa7 Merge: 69adc68ac d514e9866 Author: teor Date: Fri Aug 10 19:05:49 2018 +1000 Merge branch 'travis-osx-029' into travis-osx-032 Merge asciidoc from 029 with rust from 032. .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --cc

[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-032' into travis-osx-033

commit ed1210d0f11d21ce97823f88bf20d3659a8927cf Merge: 546c13480 69adc68ac Author: teor Date: Fri Aug 10 16:38:13 2018 +1000 Merge branch 'travis-osx-032' into travis-osx-033 Preserve 033 changes since 032. .travis.yml | 3 ++- changes/ticket24629 | 3 +++ 2 files

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

commit 81e529d236f41607b133c5562e2d5887fcfd5b8a Merge: aac1e17f2 3cfceeb45 Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 9d64304bec7c6159bcd66f614e91c1a25df2e7e3 Merge: c4e96a3de 81e529d23 Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 .travis.yml | 276 --- changes/bug26497

[tor-commits] [tor/release-0.3.4] Travis: Check disable module dirauth with and without rust

commit 2a33edc595a619d6c2abcb260195f92d97192d6a Author: teor Date: Fri Aug 10 13:20:48 2018 +1000 Travis: Check disable module dirauth with and without rust Part of 24629, also fixes 27088. --- .travis.yml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git

[tor-commits] [tor/release-0.3.4] Stop setting $CARGO_HOME

commit ce19477ffcdf64255f050308182f3d682e6f6de1 Author: teor Date: Fri Aug 10 11:00:46 2018 +1000 Stop setting $CARGO_HOME cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha. --- changes/bug26497 | 3

[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-032' into travis-osx-033

commit 2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27 Merge: c4d0d9bd2 4517c4c3e Author: teor Date: Fri Aug 10 11:43:17 2018 +1000 Merge branch 'travis-osx-032' into travis-osx-033 Replace 033 .travis.yml with 032 .travis.yml. Subsequent commits will restore 033 functionality.

[tor-commits] [tor/release-0.3.4] Travis: create configure flags once, then echo the flags

commit 7cf7b52fcab81c55a4c493bad68eddc0d27a0d63 Author: teor Date: Thu Aug 9 17:06:13 2018 +1000 Travis: create configure flags once, then echo the flags Creating the configure flags once avoids inconsistent flags between configure and distcheck configure. Echoing the

[tor-commits] [tor/release-0.3.4] Travis: Check Rust with distcheck in 0.3.3 and later

commit f5aa667d48d88f917371219ddefce26637c2b1ad Author: teor Date: Fri Aug 10 11:59:42 2018 +1000 Travis: Check Rust with distcheck in 0.3.3 and later Backports an 0.3.4 change that also works in 0.3.3. Part of 24629. --- .travis.yml | 5 +++--

[tor-commits] [tor/release-0.3.4] Travis: put distcheck first for readability

commit f4f2e43f5dfa6da163ec89ab67baa4f2f13b3197 Author: teor Date: Fri Aug 10 12:33:51 2018 +1000 Travis: put distcheck first for readability --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bc39f661b..7583eb749 100644 ---

[tor-commits] [tor/release-0.3.4] Changes file for Travis: enable macOS builds

commit 4cd3fcf2481868a693c31957fe0d61d69bf1312b Author: teor Date: Fri Aug 10 12:10:56 2018 +1000 Changes file for Travis: enable macOS builds --- changes/ticket24629 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket24629 b/changes/ticket24629 new file mode 100644

[tor-commits] [tor/release-0.3.4] Travis: add rust cargo online mode

commit 14ceee0fd1cc82da9fc6cd51d69173546bc4d7fd Author: teor Date: Thu Aug 9 22:32:20 2018 +1000 Travis: add rust cargo online mode Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Also: * build rust on clang and gcc, Linux and macOS *

[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-029' into travis-osx-032

commit 69adc68ac6031246f9c5a723755c87d6abf34fc6 Merge: 169afe3ca e78f9c5df Author: teor Date: Fri Aug 10 16:31:35 2018 +1000 Merge branch 'travis-osx-029' into travis-osx-032 Simple merge to resolve order conflicts. .travis.yml | 3 ++- changes/ticket24629 | 3 +++ 2

[tor-commits] [tor/release-0.3.4] Stop setting $CARGO_HOME in src/rust/tor_rust/include.am

commit 0f3fd10ee0f609cae6d2fe87fa437026f5e9e003 Author: teor Date: Fri Aug 10 11:47:36 2018 +1000 Stop setting $CARGO_HOME in src/rust/tor_rust/include.am cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha. ---

[tor-commits] [tor/release-0.3.4] Travis: add rust cargo offline mode

commit e387eee362fc5c73b7b54c2e887d08816732a0ae Author: teor Date: Thu Aug 9 22:52:51 2018 +1000 Travis: add rust cargo offline mode Backports parts of the 0.3.3 travis config. Part of 24629. --- .travis.yml | 5 + 1 file changed, 5 insertions(+) diff --git

[tor-commits] [tor/release-0.3.4] Changes file for Rust: backport src/test/test_rust.sh from master

commit 4517c4c3e38fe93d668ab84dc5e7cb3bd0a3c173 Author: teor Date: Fri Aug 10 11:26:53 2018 +1000 Changes file for Rust: backport src/test/test_rust.sh from master --- changes/bug26497-backport | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug26497-backport

[tor-commits] [tor/release-0.3.4] Travis: list installed package versions before building

commit fa9a0cc1fe81bef8584f446829b6fcef258cc762 Author: teor Date: Thu Aug 9 22:16:28 2018 +1000 Travis: list installed package versions before building Part of 24629. --- .travis.yml | 4 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index

[tor-commits] [tor/release-0.3.4] Fix $abs_top_srcdir in test_rust.sh

commit c9ad16ca2a2aff63fc4814c843cd376c76e43095 Author: teor Date: Fri Aug 10 11:22:36 2018 +1000 Fix $abs_top_srcdir in test_rust.sh Consistently use ../../.. as a fallback for $abs_top_srcdir in test_rust.sh. Fixes bug 27093; bugfix on 0.3.4.3-alpha. ---

[tor-commits] [tor/release-0.3.4] Travis: Use cargo cache

commit 3b1c74baa5e1b42c3271b2c74a665da6c528b106 Author: teor Date: Thu Aug 9 15:41:57 2018 +1000 Travis: Use cargo cache Closes ticket 26952. --- .travis.yml | 7 +++ changes/ticket26952-cargo | 3 +++ 2 files changed, 10 insertions(+) diff --git a/.travis.yml

[tor-commits] [tor/release-0.3.4] Travis: fix a typo

commit aee51d9a0e0772d6ad65613f67a63ab8856b7b50 Author: teor Date: Thu Aug 9 22:53:48 2018 +1000 Travis: fix a typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8d34a..25c31c3d2 100644 --- a/.travis.yml +++

[tor-commits] [tor/release-0.3.4] Travis: fix a typo

commit f76cddd3762bf615eca7ca5d95b685671171fae8 Author: teor Date: Thu Aug 9 22:53:48 2018 +1000 Travis: fix a typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9671411b4..bc39f661b 100644 --- a/.travis.yml +++

[tor-commits] [tor/release-0.3.4] Travis: Improve Rust comments

commit 169afe3ca52fc8b201f00fe8b262c75e79a199d5 Author: teor Date: Fri Aug 10 16:30:21 2018 +1000 Travis: Improve Rust comments --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8c2c9e3d6..9f1bc70e8 100644 ---

[tor-commits] [tor/release-0.3.4] Changes file for Travis: enable macOS builds

commit a5715a46c4d4b96c68ea4b30ad98c685ffadf7c2 Author: teor Date: Fri Aug 10 12:10:56 2018 +1000 Changes file for Travis: enable macOS builds --- changes/ticket24629 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket24629 b/changes/ticket24629 new file mode 100644

[tor-commits] [tor/release-0.3.4] Travis: Check Rust with distcheck in 0.3.3 and later

commit 7ec75e014fb7e736cdf392a4ca11196c0d492044 Author: teor Date: Fri Aug 10 11:59:42 2018 +1000 Travis: Check Rust with distcheck in 0.3.3 and later Backports an 0.3.4 change that also works in 0.3.3. Part of 24629. --- .travis.yml | 5 +++--

[tor-commits] [tor/release-0.3.4] Travis: put distcheck first for readability

commit f398da2e2d2c2472619b1c42463cbf2ccc84cc6a Author: teor Date: Fri Aug 10 12:33:51 2018 +1000 Travis: put distcheck first for readability --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8c2c9e3d6..c7ea5948e 100644 ---

[tor-commits] [tor/release-0.3.4] Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later

commit 82cccfbe25c3e5b5be14323b545c68c7eb52400c Author: teor Date: Fri Aug 10 11:55:50 2018 +1000 Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later TOR_RUST_DEPENDENCIES used to be spelt RUST_DEPENDENCIES in 0.3.2. Re-applies 0.3.3 changes after 24629. ---

[tor-commits] [tor/release-0.3.4] Travis: add lzma and zstd, where available

commit e4d7f2667c6c4660ad9663a39fbdef7d3e2961cd Author: teor Date: Thu Aug 9 19:33:28 2018 +1000 Travis: add lzma and zstd, where available Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Part of 24629, also fixes 27090. --- .travis.yml

[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-029' into travis-osx-032

commit 38cf52b0238bd95893935936cd5925d176c5bbb8 Merge: 8e68fe7e1 fa9a0cc1f Author: teor Date: Thu Aug 9 22:20:29 2018 +1000 Merge branch 'travis-osx-029' into travis-osx-032 Replace 032 .travis.yml with 029 .travis.yml. Subsequent commits will restore 032 functionality.

[tor-commits] [tor/release-0.3.4] Rust: backport src/test/test_rust.sh from master

commit 2a35b085977376b5c5e2dd084f9f505d8f8a Author: teor Date: Fri Aug 10 11:09:18 2018 +1000 Rust: backport src/test/test_rust.sh from master Preparation for 26497. --- src/test/test_rust.sh | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff

[tor-commits] [tor/release-0.3.4] Travis: make macOS builds work for Tor 0.2.9

commit 74b3a340df0df1eb803b4b17039725fc42d5a86a Author: teor Date: Thu Aug 9 17:44:11 2018 +1000 Travis: make macOS builds work for Tor 0.2.9 Tor 0.2.9 needs extra help to find OpenSSL on macOS. Part of 24629. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1

[tor-commits] [tor/release-0.3.4] Rust: use a consistent working directory in builds and tests

commit 229a75a49a440e61c97dca820cf59360470e1560 Author: teor Date: Fri Aug 10 11:54:26 2018 +1000 Rust: use a consistent working directory in builds and tests cd to ${abs_top_builddir}/src/rust before running cargo in src/test/test_rust.sh. Fixes bug 26497; bugfix on

[tor-commits] [tor/release-0.3.4] Travis: Use ccache

commit 286a6bc3b8fd2c369583d0d48c09769fed78e39f Author: teor Date: Thu Aug 9 15:40:27 2018 +1000 Travis: Use ccache Part of ticket 26952. --- .travis.yml| 6 ++ changes/ticket26952-ccache | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.travis.yml

[tor-commits] [tor/release-0.3.4] Travis: run an asciidoc build

commit 23b242104ba5cefb5fd16effda33a611e521050d Author: teor Date: Thu Aug 9 18:29:29 2018 +1000 Travis: run an asciidoc build Implements 27087. --- .travis.yml | 15 +-- changes/ticket27087 | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff

[tor-commits] [tor/release-0.3.4] Add more optional packages to Travis

commit 340da669be373174550e038d1d20ff2bff49eb6b Author: Taylor Yu Date: Thu Jun 28 14:43:31 2018 -0500 Add more optional packages to Travis Apparently we weren't building with either libcap or libseccomp on Travis. Install libcap-dev and libseccomp-dev in .travis.yml. Closes

[tor-commits] [tor/release-0.3.4] Travis: enable macOS builds

commit 515d190b2ca9249871d04067c3bdbd312669997e Author: teor Date: Thu Aug 9 18:03:18 2018 +1000 Travis: enable macOS builds Also: * explain why we don't install zlib Part of 24629. --- .travis.yml | 20 1 file changed, 20 insertions(+) diff

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

commit 16dec180e704a67eee93841e47e68cf55464351f Merge: 60d6a2ca6 3cfceeb45 Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 262 +-- changes/bug26497

[tor-commits] [tor/release-0.3.3] Merge branch 'travis-osx-032' into travis-osx-033

commit ed1210d0f11d21ce97823f88bf20d3659a8927cf Merge: 546c13480 69adc68ac Author: teor Date: Fri Aug 10 16:38:13 2018 +1000 Merge branch 'travis-osx-032' into travis-osx-033 Preserve 033 changes since 032. .travis.yml | 3 ++- changes/ticket24629 | 3 +++ 2 files

[tor-commits] [tor/release-0.3.3] Merge branch 'travis-osx-032' into travis-osx-033

commit 6463cdea55bbeb711a10153156a4b93f2471d034 Merge: ed1210d0f e2eec40c4 Author: teor Date: Fri Aug 10 19:06:32 2018 +1000 Merge branch 'travis-osx-032' into travis-osx-033 .travis.yml | 1 + 1 file changed, 1 insertion(+) ___ tor-commits

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2

commit a29e9a901d196243791f9210be1fed1c177521df Merge: d52f40600 e2eec40c4 Author: Nick Mathewson Date: Tue Aug 21 20:03:41 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2 .travis.yml | 253 ++-

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

commit 3cfceeb45d51f8f3c4960cabaad1849dcecb14a3 Merge: f0633bc49 a5bbe3f1d Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9

commit 05d62a3b73ed092ec1643ead56d775bb5d06f648 Merge: 85a879234 d514e9866 Author: Nick Mathewson Date: Tue Aug 21 20:03:19 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9 .travis.yml| 213 ++---

[tor-commits] [tor/release-0.3.4] Travis: Rewrite .travis.yml

commit c53f17fb1a3b787567cee1e87f03a887a5cee0bd Author: teor Date: Thu Aug 9 16:42:05 2018 +1000 Travis: Rewrite .travis.yml Build on all compilers: * default options + hardening Build on gcc: * coverage (+ no hardening) * distcheck * no hardening

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3

commit f0633bc49164a10ca163aa94139222682af376f7 Merge: 245025a3d 6463cdea5 Author: Nick Mathewson Date: Tue Aug 21 20:03:56 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3 .travis.yml | 262 +--

[tor-commits] [tor/release-0.3.3] Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later

commit a544af818671eae8f265c687e24349061d3b8450 Author: teor Date: Fri Aug 10 11:55:50 2018 +1000 Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later TOR_RUST_DEPENDENCIES used to be spelt RUST_DEPENDENCIES in 0.3.2. Re-applies 0.3.3 changes after 24629. ---

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

commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946 Merge: a29e9a901 05d62a3b7 Author: Nick Mathewson Date: Tue Aug 21 20:03:46 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.3.3] Travis: put distcheck first for readability

commit f4f2e43f5dfa6da163ec89ab67baa4f2f13b3197 Author: teor Date: Fri Aug 10 12:33:51 2018 +1000 Travis: put distcheck first for readability --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bc39f661b..7583eb749 100644 ---

[tor-commits] [tor/release-0.3.3] Travis: Check Rust with distcheck in 0.3.3 and later

commit f5aa667d48d88f917371219ddefce26637c2b1ad Author: teor Date: Fri Aug 10 11:59:42 2018 +1000 Travis: Check Rust with distcheck in 0.3.3 and later Backports an 0.3.4 change that also works in 0.3.3. Part of 24629. --- .travis.yml | 5 +++--

[tor-commits] [tor/release-0.3.3] Merge branch 'travis-osx-029' into travis-osx-032

commit e2eec40c4469c10dfb3006dfb07240d7e1144aa7 Merge: 69adc68ac d514e9866 Author: teor Date: Fri Aug 10 19:05:49 2018 +1000 Merge branch 'travis-osx-029' into travis-osx-032 Merge asciidoc from 029 with rust from 032. .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --cc

[tor-commits] [tor/release-0.3.3] Travis: add a missing macOS asciidoc env var

commit d514e98663fbac3107d02f492fbff9d6018c275d Author: teor Date: Fri Aug 10 18:26:33 2018 +1000 Travis: add a missing macOS asciidoc env var --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index eed137181..8b8621007 100644 --- a/.travis.yml

[tor-commits] [tor/release-0.3.3] Travis: Use cargo cache

commit 3b1c74baa5e1b42c3271b2c74a665da6c528b106 Author: teor Date: Thu Aug 9 15:41:57 2018 +1000 Travis: Use cargo cache Closes ticket 26952. --- .travis.yml | 7 +++ changes/ticket26952-cargo | 3 +++ 2 files changed, 10 insertions(+) diff --git a/.travis.yml

[tor-commits] [tor/release-0.3.3] Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4

commit 546c134801a17ebb63032b5ac52a65279998ea6f Author: teor Date: Fri Aug 10 13:11:27 2018 +1000 Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4 Re-applies 0.3.3 changes after 24629. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.3] Merge branch 'travis-osx-029' into travis-osx-032

commit 69adc68ac6031246f9c5a723755c87d6abf34fc6 Merge: 169afe3ca e78f9c5df Author: teor Date: Fri Aug 10 16:31:35 2018 +1000 Merge branch 'travis-osx-029' into travis-osx-032 Simple merge to resolve order conflicts. .travis.yml | 3 ++- changes/ticket24629 | 3 +++ 2

[tor-commits] [tor/release-0.3.3] Changes file for Travis: enable macOS builds

commit 4cd3fcf2481868a693c31957fe0d61d69bf1312b Author: teor Date: Fri Aug 10 12:10:56 2018 +1000 Changes file for Travis: enable macOS builds --- changes/ticket24629 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket24629 b/changes/ticket24629 new file mode 100644

[tor-commits] [tor/release-0.3.3] Travis: add a missing macOS asciidoc dependency

commit e78f9c5dfb55e71fa79c152d13a1ff72fd907040 Author: teor Date: Fri Aug 10 16:24:31 2018 +1000 Travis: add a missing macOS asciidoc dependency --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7583eb749..eed137181 100644 ---

[tor-commits] [tor/release-0.3.3] Merge branch 'travis-osx-032' into travis-osx-033

commit 2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27 Merge: c4d0d9bd2 4517c4c3e Author: teor Date: Fri Aug 10 11:43:17 2018 +1000 Merge branch 'travis-osx-032' into travis-osx-033 Replace 033 .travis.yml with 032 .travis.yml. Subsequent commits will restore 033 functionality.

[tor-commits] [tor/release-0.3.3] Travis: Improve Rust comments

commit 169afe3ca52fc8b201f00fe8b262c75e79a199d5 Author: teor Date: Fri Aug 10 16:30:21 2018 +1000 Travis: Improve Rust comments --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8c2c9e3d6..9f1bc70e8 100644 ---

[tor-commits] [tor/release-0.3.3] Changes file for Rust: backport src/test/test_rust.sh from master

commit 4517c4c3e38fe93d668ab84dc5e7cb3bd0a3c173 Author: teor Date: Fri Aug 10 11:26:53 2018 +1000 Changes file for Rust: backport src/test/test_rust.sh from master --- changes/bug26497-backport | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug26497-backport

[tor-commits] [tor/release-0.3.3] Travis: fix a typo

commit aee51d9a0e0772d6ad65613f67a63ab8856b7b50 Author: teor Date: Thu Aug 9 22:53:48 2018 +1000 Travis: fix a typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8d34a..25c31c3d2 100644 --- a/.travis.yml +++

[tor-commits] [tor/release-0.3.3] Rust: use a consistent working directory in builds and tests

commit 229a75a49a440e61c97dca820cf59360470e1560 Author: teor Date: Fri Aug 10 11:54:26 2018 +1000 Rust: use a consistent working directory in builds and tests cd to ${abs_top_builddir}/src/rust before running cargo in src/test/test_rust.sh. Fixes bug 26497; bugfix on

[tor-commits] [tor/release-0.3.3] Stop setting $CARGO_HOME in src/rust/tor_rust/include.am

commit 0f3fd10ee0f609cae6d2fe87fa437026f5e9e003 Author: teor Date: Fri Aug 10 11:47:36 2018 +1000 Stop setting $CARGO_HOME in src/rust/tor_rust/include.am cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha. ---

[tor-commits] [tor/release-0.3.3] Travis: add rust cargo online mode

commit 14ceee0fd1cc82da9fc6cd51d69173546bc4d7fd Author: teor Date: Thu Aug 9 22:32:20 2018 +1000 Travis: add rust cargo online mode Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Also: * build rust on clang and gcc, Linux and macOS *

[tor-commits] [tor/release-0.3.3] Stop setting $CARGO_HOME

commit ce19477ffcdf64255f050308182f3d682e6f6de1 Author: teor Date: Fri Aug 10 11:00:46 2018 +1000 Stop setting $CARGO_HOME cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha. --- changes/bug26497 | 3

[tor-commits] [tor/release-0.3.3] Travis: add lzma and zstd, where available

commit e4d7f2667c6c4660ad9663a39fbdef7d3e2961cd Author: teor Date: Thu Aug 9 19:33:28 2018 +1000 Travis: add lzma and zstd, where available Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Part of 24629, also fixes 27090. --- .travis.yml

[tor-commits] [tor/release-0.3.3] Fix $abs_top_srcdir in test_rust.sh

commit c9ad16ca2a2aff63fc4814c843cd376c76e43095 Author: teor Date: Fri Aug 10 11:22:36 2018 +1000 Fix $abs_top_srcdir in test_rust.sh Consistently use ../../.. as a fallback for $abs_top_srcdir in test_rust.sh. Fixes bug 27093; bugfix on 0.3.4.3-alpha. ---

[tor-commits] [tor/release-0.3.3] Rust: backport src/test/test_rust.sh from master

commit 2a35b085977376b5c5e2dd084f9f505d8f8a Author: teor Date: Fri Aug 10 11:09:18 2018 +1000 Rust: backport src/test/test_rust.sh from master Preparation for 26497. --- src/test/test_rust.sh | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff

[tor-commits] [tor/release-0.3.2] Travis: add a missing macOS asciidoc dependency

commit e78f9c5dfb55e71fa79c152d13a1ff72fd907040 Author: teor Date: Fri Aug 10 16:24:31 2018 +1000 Travis: add a missing macOS asciidoc dependency --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7583eb749..eed137181 100644 ---

[tor-commits] [tor/release-0.3.3] Add more optional packages to Travis

commit 340da669be373174550e038d1d20ff2bff49eb6b Author: Taylor Yu Date: Thu Jun 28 14:43:31 2018 -0500 Add more optional packages to Travis Apparently we weren't building with either libcap or libseccomp on Travis. Install libcap-dev and libseccomp-dev in .travis.yml. Closes

[tor-commits] [tor/release-0.3.2] Merge branch 'travis-osx-029' into travis-osx-032

commit e2eec40c4469c10dfb3006dfb07240d7e1144aa7 Merge: 69adc68ac d514e9866 Author: teor Date: Fri Aug 10 19:05:49 2018 +1000 Merge branch 'travis-osx-029' into travis-osx-032 Merge asciidoc from 029 with rust from 032. .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --cc

[tor-commits] [tor/release-0.3.3] Travis: Rewrite .travis.yml

commit c53f17fb1a3b787567cee1e87f03a887a5cee0bd Author: teor Date: Thu Aug 9 16:42:05 2018 +1000 Travis: Rewrite .travis.yml Build on all compilers: * default options + hardening Build on gcc: * coverage (+ no hardening) * distcheck * no hardening

[tor-commits] [tor/release-0.3.3] Travis: Use ccache

commit 286a6bc3b8fd2c369583d0d48c09769fed78e39f Author: teor Date: Thu Aug 9 15:40:27 2018 +1000 Travis: Use ccache Part of ticket 26952. --- .travis.yml| 6 ++ changes/ticket26952-ccache | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.travis.yml

[tor-commits] [tor/release-0.3.3] Travis: list installed package versions before building

commit fa9a0cc1fe81bef8584f446829b6fcef258cc762 Author: teor Date: Thu Aug 9 22:16:28 2018 +1000 Travis: list installed package versions before building Part of 24629. --- .travis.yml | 4 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index

[tor-commits] [tor/release-0.3.3] Travis: create configure flags once, then echo the flags

commit 7cf7b52fcab81c55a4c493bad68eddc0d27a0d63 Author: teor Date: Thu Aug 9 17:06:13 2018 +1000 Travis: create configure flags once, then echo the flags Creating the configure flags once avoids inconsistent flags between configure and distcheck configure. Echoing the

[tor-commits] [tor/release-0.3.3] Travis: enable macOS builds

commit 515d190b2ca9249871d04067c3bdbd312669997e Author: teor Date: Thu Aug 9 18:03:18 2018 +1000 Travis: enable macOS builds Also: * explain why we don't install zlib Part of 24629. --- .travis.yml | 20 1 file changed, 20 insertions(+) diff

[tor-commits] [tor/release-0.3.2] Travis: add a missing macOS asciidoc env var

commit d514e98663fbac3107d02f492fbff9d6018c275d Author: teor Date: Fri Aug 10 18:26:33 2018 +1000 Travis: add a missing macOS asciidoc env var --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index eed137181..8b8621007 100644 --- a/.travis.yml

[tor-commits] [tor/release-0.3.3] Travis: fix a typo

commit f76cddd3762bf615eca7ca5d95b685671171fae8 Author: teor Date: Thu Aug 9 22:53:48 2018 +1000 Travis: fix a typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9671411b4..bc39f661b 100644 --- a/.travis.yml +++

[tor-commits] [tor/release-0.3.3] Travis: add rust cargo offline mode

commit e387eee362fc5c73b7b54c2e887d08816732a0ae Author: teor Date: Thu Aug 9 22:52:51 2018 +1000 Travis: add rust cargo offline mode Backports parts of the 0.3.3 travis config. Part of 24629. --- .travis.yml | 5 + 1 file changed, 5 insertions(+) diff --git

[tor-commits] [tor/release-0.3.3] Travis: make macOS builds work for Tor 0.2.9

commit 74b3a340df0df1eb803b4b17039725fc42d5a86a Author: teor Date: Thu Aug 9 17:44:11 2018 +1000 Travis: make macOS builds work for Tor 0.2.9 Tor 0.2.9 needs extra help to find OpenSSL on macOS. Part of 24629. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1

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

commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946 Merge: a29e9a901 05d62a3b7 Author: Nick Mathewson Date: Tue Aug 21 20:03:46 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 54e2a3315a94b86454b687600bb02ada96b3699c Merge: 22414c050 a5bbe3f1d Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 253 ++- changes/bug26497

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2

commit a29e9a901d196243791f9210be1fed1c177521df Merge: d52f40600 e2eec40c4 Author: Nick Mathewson Date: Tue Aug 21 20:03:41 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2 .travis.yml | 253 ++-

[tor-commits] [tor/release-0.3.3] Travis: run an asciidoc build

commit 23b242104ba5cefb5fd16effda33a611e521050d Author: teor Date: Thu Aug 9 18:29:29 2018 +1000 Travis: run an asciidoc build Implements 27087. --- .travis.yml | 15 +-- changes/ticket27087 | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff

[tor-commits] [tor/release-0.3.3] Merge branch 'travis-osx-029' into travis-osx-032

commit 38cf52b0238bd95893935936cd5925d176c5bbb8 Merge: 8e68fe7e1 fa9a0cc1f Author: teor Date: Thu Aug 9 22:20:29 2018 +1000 Merge branch 'travis-osx-029' into travis-osx-032 Replace 032 .travis.yml with 029 .travis.yml. Subsequent commits will restore 032 functionality.

[tor-commits] [tor/release-0.3.2] Changes file for Rust: backport src/test/test_rust.sh from master

commit 4517c4c3e38fe93d668ab84dc5e7cb3bd0a3c173 Author: teor Date: Fri Aug 10 11:26:53 2018 +1000 Changes file for Rust: backport src/test/test_rust.sh from master --- changes/bug26497-backport | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug26497-backport

  1   2   3   4   >