Nick Mathewson
fb0019daf9
Update copyrights to 2018.
2018-06-20 08:13:28 -04:00
Nick Mathewson
11a76b903b
Merge branch 'maint-0.3.4'
2018-06-20 08:05:07 -04:00
Nick Mathewson
7b9cd5cca5
Merge branch 'asn_bug24977_final_squashed' into maint-0.3.4
2018-06-20 08:02:27 -04:00
George Kadianakis
1f1a57b8d0
Add changes file for #24977 .
2018-06-20 08:01:02 -04:00
George Kadianakis
b7b7dab00d
Recreate nodelist before use if it's outdated.
...
We currently only do the check when we are about to use the HSDir indices.
2018-06-20 08:01:02 -04:00
George Kadianakis
a686464420
Recreate voting schedule before use if it's outdated.
2018-06-20 08:01:02 -04:00
Nick Mathewson
334edc22d1
Merge branch 'maint-0.3.4'
2018-06-20 07:55:15 -04:00
Isis Lovecruft
4971d7afa6
rust: Remove redundant "testing" feature from tor_log crate.
...
It was synonymous with the builtin "test" feature.
* FIXES #26399 : https://bugs.torproject.org/26399
2018-06-20 07:55:12 -04:00
Nick Mathewson
5acbcf150e
Merge branch 'maint-0.3.4'
2018-06-20 07:53:22 -04:00
Nick Mathewson
38cb638c32
Merge branch 'rl1987_bug26196_rebased_034' into maint-0.3.4
2018-06-20 07:50:00 -04:00
rl1987
ce9b9cc18d
Add changes file
2018-06-20 07:49:41 -04:00
rl1987
9f2b887c5d
Enable DEBUG_SMARTLIST for entire codebase when expensive hardening is on
2018-06-20 07:49:41 -04:00
rl1987
9054ccb36b
Enable DEBUG_SMARTLIST in unit tests
2018-06-20 07:49:41 -04:00
rl1987
7bb3777dfb
Refrain from accessing empty smartlist in test_bridges_clear_bridge_list
...
Just check that smartlist length is zero instead
2018-06-20 07:49:41 -04:00
Nick Mathewson
152e4a1e50
Merge branch 'maint-0.3.4'
2018-06-20 07:35:17 -04:00
Nick Mathewson
ac1747e47f
Merge remote-tracking branch 'catalyst-github/bug26415_034' into maint-0.3.4
2018-06-20 07:35:13 -04:00
Nick Mathewson
b63d6984a6
Merge branch 'maint-0.3.4'
2018-06-19 19:10:28 -04:00
Alexander Færøy
e309aa4c8c
Fix linker errors when building Tor.
...
This patch fixes linking errors when compiling Tor with the dirauth
module disabled.
See: https://bugs.torproject.org/26418
2018-06-19 23:10:12 +02:00
Taylor Yu
bfd36177c4
Fix compilation of Rust crypto doctests
...
The doctests for src/rust/crypto don't compile for multiple reasons,
including some missing exports and incorrect identifier paths. Fixes
bug 26415; bugfix on 0.3.4.1-alpha.
2018-06-19 13:53:26 -05:00
Nick Mathewson
f3267741e4
Merge branch 'maint-0.3.4'
2018-06-18 17:09:03 -04:00
Nick Mathewson
d27745d81d
Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a
...
This was already added to LIBTOR_A_SOURCES; it doesn't need to get
added again.
Fixes bug 26402. Bugfix on 0.3.4.1-alpha.
2018-06-18 17:07:27 -04:00
Nick Mathewson
5879909826
Revert "Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a"
...
This reverts commit 70d91bd059
2018-06-18 17:06:18 -04:00
Nick Mathewson
70d91bd059
Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a
...
This was already added to LIBTOR_A_SOURCES; it doesn't need to get
added again.
Fixes bug 26402. Bugfix on 0.3.4.1-alpha.
2018-06-18 17:03:52 -04:00
Nick Mathewson
9af6c48d24
remove EOL@EOF advice
2018-06-18 16:18:44 -04:00
Nick Mathewson
67dc83fa75
New check-spaces rule: Our C files may not have duplicate names.
2018-06-18 16:17:11 -04:00
Nick Mathewson
6af248f27f
Finally remove our EOL@EOF check.
...
This check was added by mistake long ago. It will be nice to see
these EOLs disappear from our code over time.
2018-06-18 16:10:47 -04:00
Nick Mathewson
29982e5190
Remove redundant typedefs from _st.h files
...
The typedefs are already in or.h
2018-06-18 16:05:36 -04:00
David Goulet
a8e76f3824
test: Add missing headers in test_controller.c
...
After the big or.h refactoring, one single unit test file was missing two
headers for node_t and microdesc_t.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-06-18 15:07:30 -04:00
Nick Mathewson
104c2e9e7e
Merge branch 'split_or_h'
2018-06-18 14:18:34 -04:00
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
