8ef4c78bd6
Merge branch 'maint-0.4.1' into release-0.4.1
2019-08-08 11:11:38 +10:00
6d0883e9e9
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-08 11:11:35 +10:00
e27a74b1b1
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-08 11:11:27 +10:00
1bc2ae7be7
Merge branch 'maint-0.2.9' into maint-0.3.5
...
Merge rust additions in 0.3.5 with sudo deletions in 0.2.9.
2019-08-08 11:10:15 +10:00
97e7be2717
Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0
2019-08-08 11:07:34 +10:00
e15b9b1790
Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5
2019-08-08 11:07:11 +10:00
8d22c09abf
Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9
2019-08-08 10:55:24 +10:00
518b69b57c
Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9
2019-08-08 10:54:12 +10:00
b4a3e31fea
releasenotes: coalesce some sections.
2019-08-07 13:49:50 -04:00
766a3396c6
Remove 0.4.1.x bugfixes from 0.4.1 releasenotes
2019-08-07 13:47:03 -04:00
941edca160
start on changelog and releasenotes for 0.4.1.5
2019-08-07 13:45:43 -04:00
5a918ced20
Merge branch 'maint-0.4.1' into release-0.4.1
2019-08-06 09:19:11 -04:00
21531f35f3
Merge branch 'ticket31311_041' into maint-0.4.1
2019-08-06 09:19:05 -04:00
53abbc784e
Merge branch 'maint-0.4.1' into release-0.4.1
2019-08-05 09:59:40 -04:00
74c0595965
Ignore regular cells in padding circuits.
...
Padding circuits were regular cells that got closed before their padding
machine could finish. This means that they can still receive regular cells from
their past life, but they have no way or reason to answer them anymore. Hence
let's ignore them before they even get to the proper subsystems.
2019-08-05 13:48:58 +03:00
3945282419
make dist: only include files from practracker dir intentionally.
...
Previously, we included temporary files and whatnot, which is not
good.
Fixes bug 31311; bugfix on 0.4.1.1-alpha.
2019-08-01 13:47:05 -04:00
3c8a7cb54c
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-29 12:02:54 -04:00
1d6054f750
Merge branch 'tor-github/pr/1179' into maint-0.4.1
2019-07-29 12:02:47 -04:00
99bc2ac5aa
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 21:52:16 -04:00
d8264ab62b
bump to 0.4.1.4-rc-dev
2019-07-25 21:51:53 -04:00
716c48c250
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 20:11:47 -04:00
278e65887b
Fix more 32-bit errors with domain and tt_int_op
2019-07-25 20:11:33 -04:00
5b31efe174
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 16:57:32 -04:00
6095bbf74e
test: Use a 64-bit comparison for logging domains.
2019-07-25 16:57:06 -04:00
6c4a6d1700
More edits, and pick a release date
...
(thanks to seborn)
2019-07-25 11:30:41 -04:00
15f49acb7f
Changelog edits
2019-07-25 11:06:00 -04:00
f05624030a
more entries for 0.4.1.4-rc changelog
2019-07-25 11:02:29 -04:00
53ece8bd23
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 10:27:41 -04:00
af26cd6101
Always check the retval of circpad_machine_current_state().
2019-07-25 10:24:23 -04:00
bd1ac408d8
Remove dead code from circpad_machine_remove_token().
2019-07-25 10:24:19 -04:00
530347972d
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 09:03:01 -04:00
2a4b156978
Merge branch 'tor-github/pr/1171' into maint-0.4.1
2019-07-25 09:02:53 -04:00
d62af7ae3f
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 09:01:38 -04:00
b2a6b52825
Bump version to 0.4.1.4-rc
2019-07-25 09:00:53 -04:00
08b3436ae8
Start on 0.4.1.4-rc changelog
2019-07-25 09:00:08 -04:00
167d873bde
Fix clang-detected errors related to log_domain_mask_t
2019-07-24 09:08:48 -04:00
b0a06e7b18
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-24 12:32:06 +03:00
bb33a2f290
Merge branch 'tor-github/pr/1181' into maint-0.4.1
2019-07-24 12:31:56 +03:00
6340873047
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-23 09:39:51 -04:00
c541258fac
Merge branch 'tor-github/pr/1158' into maint-0.4.1
2019-07-23 09:39:43 -04:00
5fb070a14d
Extract the log_domain_t type to a lower-level header
...
This way, both err and log may depend on it.
2019-07-19 10:17:22 -04:00
f682de609b
Adjust tor_log.rs for 64-bit log domains.
2019-07-19 10:07:32 -04:00
a9379d6750
Set 'routerlist' global to NULL before freeing it.
...
There is other code that uses this value, and some of it is
apparently reachable from inside router_dir_info_changed(), which
routerlist_free() apparently calls. (ouch!) This is a minimal fix
to try to resolve the issue without causing other problems.
Fixes bug 31003. I'm calling this a bugfix on 0.1.2.2-alpha, where
the call to router_dir_info_changed() was added to routerlist_free().
2019-07-19 09:49:52 -04:00
8bbec36b3b
Changes file for bug 31001
2019-07-19 09:21:45 -04:00
17458a87d7
Prevent UB on signed overflow.
...
Overflowing a signed integer in C is an undefined behaviour.
It is possible to trigger this undefined behaviour in tor_asprintf on
Windows or systems lacking vasprintf.
On these systems, eiter _vscprintf or vsnprintf is called to retrieve
the required amount of bytes to hold the string. These functions can
return INT_MAX. The easiest way to recreate this is the use of a
specially crafted configuration file, e.g. containing the line:
FirewallPorts AAAAA<in total 2147483610 As>
This line triggers the needed tor_asprintf call which eventually
leads to an INT_MAX return value from _vscprintf or vsnprintf.
The needed byte for \0 is added to the result, triggering the
overflow and therefore the undefined behaviour.
Casting the value to size_t before addition fixes the behaviour.
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org >
2019-07-19 09:21:32 -04:00
2e55fa9587
Adjust log callback type to use log_domain_mask_t
2019-07-08 14:11:02 -04:00
4512578e49
Add a compile-time assertion to prevent a recurrence of 31080.
2019-07-08 13:41:35 -04:00
09c692e72b
Use a 64-bit mask for log domains, and fix a conflict
...
When we added LD_MESG, we created a conflict with the LD_NO_MOCK
flag. We now need 64 bits for log domains in order to fix this
issue.
Fixes bug 31080; bugfix on 0.4.1.1-alpha.
2019-07-08 13:32:45 -04:00
d972f29d8d
Move declaration of LD_NO_MESG to make conflict more apparent.
2019-07-08 13:00:31 -04:00
2a42d6be27
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-07-01 14:25:12 -04:00
teor
Nick Mathewson
George Kadianakis
David Goulet
Tobias Stoeckmann