torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
28,793 Commits 53 Branches 631 Tags
bcc1368c77d6ed8ac7f8bd81acdec7bb2da9f925
Commit Graph

28793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson bcc1368c77 Merge branch 'maint-0.3.4' 2018-06-18 13:10:47 -04:00
Nick Mathewson 9799cc90b0 Merge branch 'rust_rand_tests' into maint-0.3.4 2018-06-18 13:10:24 -04:00
Nick Mathewson ac64e00794 Changes file for "make clippy" 2018-06-18 11:30:06 -04:00
Nick Mathewson ea6e17ca05 Merge remote-tracking branch 'isis-github/bug22156' 2018-06-18 11:29:04 -04:00
Nick Mathewson 3640c63498 Merge remote-tracking branch 'ffmancera-1/bug24658-dh_stream' 2018-06-17 20:39:13 -04:00
Nick Mathewson 16dd2f7bb0 Merge remote-tracking branch 'rl1987/bug25477' 2018-06-17 20:25:40 -04:00
Nick Mathewson 5746e210b8 Merge remote-tracking branch 'rl1987/feature8323_squashed2' 2018-06-17 20:20:15 -04:00
Nick Mathewson d5e4b6983f Merge remote-tracking branch 'rl1987/bug26282' 2018-06-17 19:32:08 -04:00
Nick Mathewson 987174cc6f Merge remote-tracking branch 'github/bug26152_035' 2018-06-17 19:28:59 -04:00
Nick Mathewson 4e439cd401 Merge remote-tracking branch 'juga/editorconfig' 2018-06-17 19:24:58 -04:00
Nick Mathewson 70e672f856 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-06-17 19:24:48 -04:00
Nick Mathewson 2e88ba985d Merge branch 'maint-0.3.4' 2018-06-17 19:24:48 -04:00
Nick Mathewson a360bf287d Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-17 19:24:48 -04:00
Nick Mathewson 6107a2127b Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-17 19:24:48 -04:00
Nick Mathewson 340fcc7e2e Merge branch 'maint-0.2.9' into maint-0.3.1 2018-06-17 19:24:48 -04:00
juga0 dd69e74e3f Add .editorconfig to follow coding standards style 2018-06-17 19:24:40 -04:00
Nick Mathewson e6aa2d526e Changes to make the rust crypto::mod tests compile 
The digest tests don't link yet, though.
 2018-06-16 13:22:44 -04:00
Nick Mathewson 8184f45ad9 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-06-16 13:10:19 -04:00
Nick Mathewson 1de722d7a9 Merge branch 'maint-0.3.4' 2018-06-16 13:10:19 -04:00
Nick Mathewson ccf1eb3164 Fix a bug in my fix for #26258 
The fix here is use a different bourne shell subsitution for
CARGO_ONLINE, so that an empty string counts as set.
 2018-06-16 13:08:40 -04:00
Nick Mathewson 5cb45d2c7a Merge branch 'maint-0.3.4' 2018-06-16 12:43:35 -04:00
Nick Mathewson 71ddfbaadd Merge remote-tracking branch 'isis/bug26267' into maint-0.3.4 2018-06-16 12:43:28 -04:00
Nick Mathewson 97cc61e947 Merge branch 'maint-0.3.4' 2018-06-16 10:20:27 -04:00
Nick Mathewson 3dd94a7ea7 Changes file for rust fatal warnings 2018-06-16 10:20:21 -04:00
Nick Mathewson 530d67410f Merge remote-tracking branch 'isis/bug26245' into maint-0.3.4 2018-06-16 10:19:26 -04:00
Nick Mathewson 8c1e2d7557 Merge branch 'maint-0.3.4' 2018-06-16 10:15:39 -04:00
Isis Lovecruft 748a0c7d0b rust: Remove unused N_DIGEST_ALGORITHMS constant from crypto_digest.rs. 
In the C code, this constant is only ever used in src/test/bench.c.

 * FIXES part of #26245: https://bugs.torproject.org/26245
 2018-06-15 23:22:43 +00:00
Isis Lovecruft d5a9b77a28 rust: Add comment and pragma on "unused" smartlist_t type. 
* FIXES part of #26245: https://bugs.torproject.org/26245
 2018-06-15 22:49:39 +00:00
Taylor Yu 468bf58fa2 Make Rust warnings conditionally fatal 
Set rustc flags to treat warnings as fatal if configured with
--enable-warnings.
 2018-06-15 17:27:19 -05:00
Isis Lovecruft ac5b1428ea rust: Expose rand module from crypto crate. 2018-06-15 21:44:22 +00:00
Nick Mathewson e22822e4ae Bump master to 0.3.5.0-alpha-dev tor-0.3.5.0-alpha-dev 2018-06-15 17:19:49 -04:00
Taylor Yu 9dd45456fe Set default-features = false for rand_core 
Apparently rand and rand_core need to be built with the "std" feature
set consistently, or there will be a compile error in rngs/jitter.rs.
 2018-06-15 15:19:16 -05:00
Nick Mathewson 945d871da5 Merge branch 'maint-0.3.3' 2018-06-14 12:50:26 -04:00
Nick Mathewson 71065201dd Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3 2018-06-14 12:47:09 -04:00
Nick Mathewson ee860b8f37 squash! Make sure that the test_rust.sh script fails when a test fails 
Also make sure that we're actually running the test from within the right
cwd, like we do when we're building.  This seems necessary to avoid
an error when running offline.

Amusingly, it appears that we had this bug before: we just weren't
noticing it, because of bug 26258.
 2018-06-13 12:21:25 -04:00
Nick Mathewson ed7b135812 Merge remote-tracking branch 'asn-github/bug26358' 2018-06-13 10:00:37 -04:00
Nick Mathewson 7e7585d0a1 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-13 09:59:28 -04:00
Nick Mathewson ca6d289c00 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-13 09:59:28 -04:00
Nick Mathewson 7cc3cdef22 Merge branch 'maint-0.3.3' 2018-06-13 09:59:28 -04:00
Nick Mathewson 9713ecfc40 Fix an extra space in a changes file 2018-06-13 09:59:26 -04:00
Nick Mathewson 049ba66746 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-13 09:58:05 -04:00
Nick Mathewson 286d02995f Merge branch 'maint-0.3.3' 2018-06-13 09:58:05 -04:00
Nick Mathewson 6017447e3a Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-13 09:58:04 -04:00
Nick Mathewson 94f3007627 Merge branch 'bug26158_031' into maint-0.3.1 2018-06-13 09:58:01 -04:00
Nick Mathewson 1c80eb92fa Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-13 09:57:10 -04:00
Nick Mathewson 76e9de7c6d Merge branch 'maint-0.3.3' 2018-06-13 09:57:10 -04:00
Nick Mathewson ff70cc84f8 Merge branch 'bug25686_diagnostic_032' into maint-0.3.2 2018-06-13 09:56:17 -04:00
Nick Mathewson 8c8ed91aae Merge remote-tracking branch 'rl1987/bug24891' 2018-06-13 09:46:50 -04:00
George Kadianakis 99974d4c1e Silence warning of relaycell/circbw tst. 
Shouldn't send RELAY_COMMAND_DATA cell with 0 stream id.
 2018-06-13 14:14:17 +03:00
Nick Mathewson 1b04dab60c copy 0.3.3.7 changelog forward to master 2018-06-12 12:06:26 -04:00