nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,732 Commits 53 Branches 630 Tags 125 MiB
b1d0fa04fb
Commit Graph

29732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
075fcb599c Merge branch 'maint-0.3.4' 2018-08-15 02:16:23 -04:00
Nick Mathewson
1868982de6 Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3 2018-08-15 02:16:19 -04:00
Nick Mathewson
b329cdf768 Merge remote-tracking branch 'public/bug26779_035' 2018-08-15 02:14:17 -04:00
Nick Mathewson
57d0b8c3cd Merge remote-tracking branch 'tor-github/pr/206' 2018-08-11 10:14:29 -04:00
Nick Mathewson
c775689e96 Merge remote-tracking branch 'tor-github/pr/244' 2018-08-11 10:05:15 -04:00
Nick Mathewson
61d5bcc1a2 Merge remote-tracking branch 'tor-github/pr/268' 2018-08-11 10:04:04 -04:00
Nick Mathewson
b7ed61167f Merge remote-tracking branch 'tor-github/pr/239' 2018-08-10 12:35:06 -04:00
teor
00e4a70774
Merge branch 'travis-osx-034' into travis-osx-master 2018-08-10 19:07:02 +10:00
teor
c28da0d8e1
Merge branch 'travis-osx-033' into travis-osx-034 2018-08-10 19:06:45 +10:00
teor
6463cdea55
Merge branch 'travis-osx-032' into travis-osx-033 2018-08-10 19:06:32 +10:00
teor
e2eec40c44
Merge branch 'travis-osx-029' into travis-osx-032 
Merge asciidoc from 029 with rust from 032.
 2018-08-10 19:06:01 +10:00
teor
d514e98663
Travis: add a missing macOS asciidoc env var 2018-08-10 18:26:33 +10:00
teor
4e6d754f35
Merge branch 'travis-osx-034' into travis-osx-master 2018-08-10 16:42:13 +10:00
teor
a1c110a2a4
Merge branch 'travis-osx-033' into travis-osx-034 
Take the asciidoc changes from 033, and the module changes from
034.
 2018-08-10 16:41:27 +10:00
teor
ed1210d0f1
Merge branch 'travis-osx-032' into travis-osx-033 
Preserve 033 changes since 032.
 2018-08-10 16:38:13 +10:00
teor
546c134801
Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4 
Re-applies 0.3.3 changes after 24629.
 2018-08-10 16:37:19 +10:00
teor
f5aa667d48
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.
 2018-08-10 16:37:06 +10:00
teor
a544af8186
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.
 2018-08-10 16:34:04 +10:00
teor
69adc68ac6
Merge branch 'travis-osx-029' into travis-osx-032 
Simple merge to resolve order conflicts.
 2018-08-10 16:31:35 +10:00
teor
169afe3ca5
Travis: Improve Rust comments 2018-08-10 16:30:21 +10:00
teor
e78f9c5dfb
Travis: add a missing macOS asciidoc dependency 2018-08-10 16:24:31 +10:00
teor
19038ff4bb
Revert "Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4" 
This reverts commit e1291aa84a.
 2018-08-10 13:30:16 +10:00
teor
ace98493bd
Merge branch 'travis-osx-034' into travis-osx-master 
Replace master .travis.yml with 034 .travis.yml.
All the changes in master have been backported to the
034 .travis.yml already.

Replace master src/test/test_rust.sh with 034
src/test/test_rust.sh, which was backported from
master. One 033/034-specific commit needs to be
reverted.
 2018-08-10 13:28:19 +10:00
teor
2a33edc595
Travis: Check disable module dirauth with and without rust 
Part of 24629, also fixes 27088.
 2018-08-10 13:23:58 +10:00
teor
6e0be81211
Merge branch 'travis-osx-033' into travis-osx-034 
Replace 034 .travis.yml with 033 .travis.yml.
Subsequent commits will restore 034 functionality.

Replace 034 src/test/test_rust.sh with 033
src/test/test_rust.sh, which was backported from
master.
 2018-08-10 13:15:16 +10:00
teor
e1291aa84a
Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4 
Re-applies 0.3.3 changes after 24629.
 2018-08-10 13:11:27 +10:00
teor
a5715a46c4
Changes file for Travis: enable macOS builds 2018-08-10 12:44:31 +10:00
teor
7ec75e014f
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.
 2018-08-10 12:44:20 +10:00
teor
82cccfbe25
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.
 2018-08-10 12:42:18 +10:00
teor
f398da2e2d
Travis: put distcheck first for readability 2018-08-10 12:41:58 +10:00
teor
f4f2e43f5d
Travis: put distcheck first for readability 2018-08-10 12:33:51 +10:00
teor
4cd3fcf248
Changes file for Travis: enable macOS builds 2018-08-10 12:10:56 +10:00
teor
229a75a49a
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 0.3.3.2-alpha.
 2018-08-10 11:54:26 +10:00
teor
0f3fd10ee0
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.
 2018-08-10 11:47:36 +10:00
teor
2b9dd0f9c0
Merge branch 'travis-osx-032' into travis-osx-033 
Replace 033 .travis.yml with 032 .travis.yml.
Subsequent commits will restore 033 functionality.

src/rust/tor_util/include.am is deleted in 033.
Subsequent commits will apply 032 changes to
src/rust/tor_rust/include.am.

Replace 033 src/test/test_rust.sh with 032
src/test/test_rust.sh, which was backported from
master.
 2018-08-10 11:43:17 +10:00
teor
4517c4c3e3
Changes file for Rust: backport src/test/test_rust.sh from master 2018-08-10 11:26:53 +10:00
teor
3b1c74baa5
Travis: Use cargo cache 
Closes ticket 26952.
 2018-08-10 11:23:26 +10:00
teor
c9ad16ca2a
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.
 2018-08-10 11:22:36 +10:00
teor
ce19477ffc
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.
 2018-08-10 11:14:32 +10:00
teor
2a35b085ee
Rust: backport src/test/test_rust.sh from master 
Preparation for 26497.
 2018-08-10 11:09:18 +10:00
teor
f76cddd376
Travis: fix a typo 2018-08-10 10:50:35 +10:00
teor
aee51d9a0e
Travis: fix a typo 2018-08-09 23:44:27 +10:00
teor
e387eee362
Travis: add rust cargo offline mode 
Backports parts of the 0.3.3 travis config.

Part of 24629.
 2018-08-09 23:42:26 +10:00
teor
14ceee0fd1
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
* build combinations of non-default options on gcc Linux
* exclude broken builds
* log the rustup version

Part of 24629.
 2018-08-09 23:40:24 +10:00
Nick Mathewson
5980cb8a19 Merge branch 'maint-0.3.4' 2018-08-09 08:47:26 -04:00
Nick Mathewson
b4362b99cf Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-09 08:47:25 -04:00
Nick Mathewson
fde551a387 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-08-09 08:47:25 -04:00
Nick Mathewson
8982719f6a Merge branch 'maint-0.2.9' into maint-0.3.2 2018-08-09 08:47:24 -04:00
teor
e4d7f2667c
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.
 2018-08-09 22:22:27 +10:00
teor
38cf52b023
Merge branch 'travis-osx-029' into travis-osx-032 
Replace 032 .travis.yml with 029 .travis.yml.
Subsequent commits will restore 032 functionality.
 2018-08-09 22:20:29 +10:00