Nick Mathewson
99fbbc6c47
Fix a typo in an address_set.c comment.
2018-02-12 11:14:34 -05:00
Fernando Fernandez Mancera
eb089ecaa0
Improve the documentation of AccountingStart parameter.
...
Fixes #23635 .
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
2018-02-12 17:10:04 +01:00
Nick Mathewson
4f98ec9fd3
Merge branch 'maint-0.3.2'
2018-02-12 08:33:48 -05:00
Nick Mathewson
021c3bd587
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-12 08:33:47 -05:00
Nick Mathewson
91109bc813
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-12 08:33:47 -05:00
Nick Mathewson
e91bae66d8
Merge branch 'bug23318-redux_029' into maint-0.2.9
2018-02-12 08:33:03 -05:00
Fernando Fernandez Mancera
3dd2c1d022
Tweaks into router_should_be_dirserver() log msg.
...
Fixed log message that has been changed in commit 5ea993fa5a
2018-02-12 12:30:52 +01:00
Nick Mathewson
019bb55181
Merge branch 'maint-0.3.2'
2018-02-11 18:11:04 -05:00
Nick Mathewson
98fc8cd937
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 18:11:04 -05:00
Nick Mathewson
b2c4d4e7fa
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:11:04 -05:00
Nick Mathewson
84c13336c4
Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9
2018-02-11 18:10:59 -05:00
Nick Mathewson
a7f5ece2b9
Merge branch 'maint-0.3.2'
2018-02-11 18:09:35 -05:00
Nick Mathewson
67043d957f
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 18:09:35 -05:00
Nick Mathewson
8939eaf479
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:09:35 -05:00
Nick Mathewson
848ba26c18
Merge branch 'ticket24315_029' into maint-0.2.9
2018-02-11 18:07:37 -05:00
Nick Mathewson
bdc29eaa7e
Merge branch 'maint-0.3.2'
2018-02-11 17:01:00 -05:00
Nick Mathewson
684d57fe8a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 17:00:52 -05:00
Nick Mathewson
eccef6ba60
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 16:51:56 -05:00
Nick Mathewson
5dc785ceef
Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9
2018-02-11 16:51:53 -05:00
Nick Mathewson
a75ae628c7
Merge remote-tracking branch 'isis/bug25127_redux'
2018-02-11 16:17:41 -05:00
Nick Mathewson
7aa94f7441
fix compilation.
2018-02-11 16:16:58 -05:00
Nick Mathewson
3834441a72
chnages file for 25120
2018-02-11 16:14:19 -05:00
Nick Mathewson
627974b02e
Merge branch 'bug25120'
2018-02-11 16:10:58 -05:00
Alexander Færøy
14c47a0b5c
Lower log-level in different error conditions in entropy selection.
...
This patch lowers the log-level from warning to info in the cases where
we are going to attempt another method as entropy source to hopefully
make the user feel less concerned.
See: https://bugs.torproject.org/25120
2018-02-11 16:10:50 -05:00
Nick Mathewson
4de20d1754
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-10 16:09:01 -05:00
Nick Mathewson
1df701c082
Merge branch 'maint-0.3.2'
2018-02-10 16:09:01 -05:00
Nick Mathewson
86583ad78e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-10 16:09:00 -05:00
Nick Mathewson
320dac4602
Merge branch 'bug24978_029_enable' into maint-0.2.9
2018-02-10 16:08:58 -05:00
Nick Mathewson
791ceb2028
Bump version to 0.3.3.2-alpha-dev
2018-02-10 10:41:23 -05:00
Nick Mathewson
efc1057162
Increment the release date in the changelog.
...
"We fray into the future, rarely wrought
save in the tapestries of afterthought"
-- Richard Wilbur, _Years End_
2018-02-10 09:57:36 -05:00
Isis Lovecruft
a4797a7e62
rust: Remove now unused byte_slice_is_c_like() utility.
2018-02-10 02:31:07 +00:00
Isis Lovecruft
081e99c16f
rust: Remove empty_static_cstr() in favour of new cstr!() macro.
2018-02-10 02:19:18 +00:00
Isis Lovecruft
6c77593a57
rust: Use tor_util::strings utils for protover_compute_for_old_tor.
2018-02-10 02:18:55 +00:00
Isis Lovecruft
3c4e006e7e
rust: Use tor_util::strings utils for protover_get_supported_protocols.
2018-02-10 02:15:06 +00:00
Isis Lovecruft
8fff331bb0
rust: Add macro for passing static borrowed strings from Rust to C.
...
* ADD a new macro, tor_util::string::cstr!() which takes Rust strings,
concatenates them together, appends a NUL byte, and converts it into a
std::ffi::CStr for handing to C.
2018-02-10 02:15:06 +00:00
Isis Lovecruft
45c59eff6c
rust: Replace two unwrap()s in FFI code with unwrap_or()s.
2018-02-10 01:21:31 +00:00
Nick Mathewson
9e0d468498
Bump to 0.3.3.2-alpha
2018-02-09 17:25:58 -05:00
Nick Mathewson
379372b90a
Re-wrap and sort the changelog
2018-02-09 17:25:30 -05:00
Roger Dingledine
416a385fee
final mucking. all yours, nick
2018-02-09 17:24:45 -05:00
Roger Dingledine
3fdd08a174
more changelog cleanup
2018-02-09 17:10:34 -05:00
Roger Dingledine
99666dc6c4
whitespace and typo cleanups
2018-02-09 17:05:20 -05:00
Roger Dingledine
d95c7c7f52
changelog cleanups
2018-02-09 17:04:39 -05:00
Nick Mathewson
6b85ff95a2
Tweak blurb, re-sort changelog
2018-02-09 16:01:45 -05:00
Nick Mathewson
859ae85287
Write a blurb
2018-02-09 16:01:31 -05:00
Nick Mathewson
e5d78c70b0
Begin work on a changelog
2018-02-09 15:58:26 -05:00
Nick Mathewson
abdf2a6f7f
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
2018-02-09 12:08:12 -05:00
David Goulet
1a4fc9cddf
test: DoS test to make sure we exclude known relays
...
Part of #25193
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-09 11:31:01 -05:00
David Goulet
666582a679
dos: Exclude known relays from client connection count
...
This is to avoid positively identifying Exit relays if tor client connection
comes from them that is reentering the network.
One thing to note is that this is done only in the DoS subsystem but we'll
still add it to the geoip cache as a "client" seen. This is done that way so
to avoid as much as possible changing the current behavior of the geoip client
cache since this is being backported.
Closes #25193
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-09 11:13:04 -05:00
Nick Mathewson
549a450f52
Add a "make test-rust" target to run the rust tests only.
2018-02-08 17:51:57 -05:00
Nick Mathewson
d9826b0a30
Merge remote-tracking branch 'frewsxcv/frewsxcv-protover'
2018-02-08 17:45:17 -05:00
