Nick Mathewson
042aed3f1d
Merge remote-tracking branch 'onionk/rust-docs1'
2018-08-17 09:07:06 -04:00
Neel Chauhan
64d9ea1413
In addrs_in_same_network_family(), choose IP subnet size based on IP type
2018-08-17 13:37:51 +10:00
cypherpunks
fc7fed6155
rust/protover: fix docs for UnvalidatedProtoEntry::from_str
...
This got shuffled around in b786b146ed
and hasn't been accurate since 124caf28e6
.
2018-08-17 02:38:23 +00:00
cypherpunks
e65a4fa42c
rust/protover: fix parsing docs
...
The function takes an already validated utf-8 string, and
it never checks if the version numbers are an empty string.
That parse error happens later.
Fix on 701c2b69f5
2018-08-17 02:38:23 +00:00
cypherpunks
7bb658a633
rust/protover: fix ProtoEntry::from_str docs
...
Texxt was copied from a function that returned a single
tuple in 88b2f170e4
.
2018-08-17 02:38:23 +00:00
Nick Mathewson
c8aecd14fe
Merge branch 'pr275_squashed'
2018-08-16 08:43:05 -04:00
cypherpunks
6b609ce435
rust: run rustfmt
2018-08-16 08:42:57 -04:00
cypherpunks
32ad8e9919
add make check-rustfmt
2018-08-16 08:42:57 -04:00
cypherpunks
ceac10fc3d
rust: max_width=100, other rustfmt settings. #27071
...
These are the 12 stable and documented configuration options,
set to their default values.
use_small_heuristics is only stabilized in rustfmt 0.9, so maintain
support for 0.8.x for now by commenting it out.
comment_width is unstable and did nothing, since wrap_comments defaults
to false.
Default values gotten from `rustfmt --print-config default rustfmt.toml`.
e7932fa9c2/Configurations.md
2018-08-16 08:42:57 -04:00
cypherpunks
fef2ba2267
rust/docs: fix critical typo for missing_docs lint
...
Fix typo from fe66d06a45
.
The exclamation point is what lets an attribute apply to
an entire crate, without the ! it's practically a placebo.
Fix on commits af182d4ab5
and
b6059297d7
, and note there are
still missing docs in both crypto and protover, for now.
https://doc.rust-lang.org/reference/attributes.html
2018-08-16 08:42:57 -04:00
Nick Mathewson
936e2aa0de
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-16 08:37:11 -04:00
Nick Mathewson
b49355915b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-16 08:37:11 -04:00
Nick Mathewson
7e50d43f07
Merge branch 'maint-0.3.4'
2018-08-16 08:37:11 -04:00
George Kadianakis
c798957b59
Keep descriptor rotation time after HUP occurs.
2018-08-16 08:36:48 -04:00
Nick Mathewson
2deee972a3
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-16 08:35:31 -04:00
Nick Mathewson
a7ea639f12
Merge branch 'maint-0.3.4'
2018-08-16 08:35:31 -04:00
Nick Mathewson
4847e22168
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-16 08:35:27 -04:00
Nick Mathewson
d029a5162d
Merge branch 'ticket27096'
2018-08-16 08:32:06 -04:00
rl1987
fb137b30fc
Exclude setenv/unsetenv code on Windows
2018-08-16 08:31:45 -04:00
rl1987
f454c28303
Fix test to pass without HOME env being set
2018-08-16 08:31:45 -04:00
teor
db3414dd51
Rust: Say that we support rust stable in GettingStartedRust.md
...
In 24765, we said that we supported rust stable in CodingStandardsRust.md.
But we left GettingStartedRust.md saying that we support rust nightly.
Closes 27160.
2018-08-16 18:58:47 +10:00
Nick Mathewson
571cb2f662
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 12:20:57 -04:00
Nick Mathewson
0fc171a47b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-15 12:20:57 -04:00
Nick Mathewson
34083f00ab
Merge branch 'maint-0.3.4'
2018-08-15 12:20:57 -04:00
Nick Mathewson
a26a2735b9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-15 12:20:57 -04:00
Nick Mathewson
4c355ff185
Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
2018-08-15 12:20:53 -04:00
Nick Mathewson
075fcb599c
Merge branch 'maint-0.3.4'
2018-08-15 02:16:23 -04:00
Nick Mathewson
6c1d2549df
Merge branch 'maint-0.3.3' into 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
Neel Chauhan
f282375fb7
Add regression test for Bug #20874
2018-08-11 18:09:01 -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