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
31,498 Commits 53 Branches 631 Tags
ea1de844323e9eecdce833e24bcf7fda130f3b3e
Commit Graph

31498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson ea1de84432 Merge branch 'maint-0.4.0' into release-0.4.0 2019-03-05 13:00:05 -05:00
David Goulet a999cb43df protover: Add missing Padding to translate_to_rust 
This commit also explicitly set the value of the PRT enum so we can match/pin
the C enum values to the Rust one in protover/ffi.rs.

Fixes #29631

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-03-05 12:33:43 -05:00
teor 5529449bb2 Merge branch 'maint-0.4.0' into release-0.4.0 2019-03-01 14:17:41 +10:00
teor 955a622391 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-03-01 14:17:31 +10:00
teor 1c248fa27d Merge branch 'maint-0.3.4' into maint-0.3.5 2019-03-01 14:16:59 +10:00
teor f56645917e Merge branch 'maint-0.3.3' into maint-0.3.4 2019-03-01 14:16:22 +10:00
teor 76b55fde81 Merge branch 'maint-0.2.9' into maint-0.3.3 2019-03-01 14:15:59 +10:00
teor 7786198eef Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9 2019-03-01 14:15:00 +10:00
teor c1ab538479 Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9 2019-03-01 14:14:51 +10:00
teor ecbc2e80a0 Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9 2019-03-01 14:14:26 +10:00
Nick Mathewson 35a2590f29 Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-28 11:22:03 -05:00
Nick Mathewson dc19d65c3b Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0 2019-02-28 11:20:26 -05:00
teor a0ada65a3a Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-28 10:49:55 +10:00
teor aef6e61347 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-02-28 10:49:47 +10:00
teor de0969ef78 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-02-28 10:49:33 +10:00
teor 6a61a020ee Merge branch 'maint-0.3.3' into maint-0.3.4 2019-02-28 10:49:19 +10:00
teor be71cce9f8 Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3 2019-02-28 10:48:46 +10:00
teor bcd6f21d98 Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-28 10:46:22 +10:00
teor 90c8956e21 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-02-28 10:46:14 +10:00
teor be29dfedd9 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-02-28 10:45:59 +10:00
teor 524731503e Merge branch 'maint-0.3.3' into maint-0.3.4 2019-02-28 10:45:44 +10:00
teor 3313444ef0 Merge branch 'maint-0.2.9' into maint-0.3.3 2019-02-28 10:45:30 +10:00
Nick Mathewson 5f24c7fcac Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-27 10:00:01 -05:00
Nick Mathewson 56f01e58b4 Merge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0 2019-02-27 09:59:33 -05:00
teor d4b7975ce7 test/shared-random: use sr_state_free_all() rather than sr_state_free() 
sr_state_free() was renamed to sr_state_free_all() between 0.2.9 and 0.3.3.

Part of 29599.
 2019-02-27 15:06:53 +10:00
teor 64e082e892 Merge branch 'bug29599_029' into bug29599_033 2019-02-27 15:06:39 +10:00
teor 4d9eb4dd0e test/shared-random: Stop leaking shared random state in the unit tests 
Stop leaking parts of the shared random state in the shared-random unit
tests.

Fixes bug 29599; bugfix on 0.2.9.1-alpha.
 2019-02-27 15:04:40 +10:00
teor a0033c8552 Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-27 09:38:26 +10:00
teor ef2925e742 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-02-27 09:38:19 +10:00
teor 15dc33849e Merge branch 'maint-0.3.4' into maint-0.3.5 2019-02-27 09:38:04 +10:00
teor 1a194beb2c Merge branch 'maint-0.3.3' into maint-0.3.4 2019-02-27 09:37:50 +10:00
teor 6c966b894c Merge branch 'maint-0.2.9' into maint-0.3.3 2019-02-27 09:37:36 +10:00
David Goulet ad1ffb6b2f Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-26 11:25:15 -05:00
David Goulet a5dd41b9af Merge branch 'tor-github/pr/638' into maint-0.4.0 2019-02-26 11:24:43 -05:00
David Goulet e4429d2341 Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-26 10:48:13 -05:00
David Goulet 4746e1261b Merge branch 'maint-0.3.5' into maint-0.4.0 2019-02-26 10:48:12 -05:00
David Goulet 9c4ec414bd Merge branch 'tor-github/pr/692' into maint-0.4.0 2019-02-26 10:47:54 -05:00
David Goulet 1216f99534 Merge branch 'tor-github/pr/691' into maint-0.3.5 2019-02-26 10:46:52 -05:00
Alexander Færøy aa360b255b Fix crash bug in PT subsystem. 
This patch fixes a crash bug (assertion failure) in the PT subsystem
that could get triggered if the user cancels bootstrap via the UI in
TorBrowser. This would cause Tor to call `managed_proxy_destroy()` which
called `process_free()` after it had called `process_terminate()`. This
leads to a crash when the various process callbacks returns with data
after the `process_t` have been freed using `process_free()`.

We solve this issue by ensuring that everywhere we call
`process_terminate()` we make sure to detach the `managed_proxy_t` from
the `process_t` (by calling `process_set_data(process, NULL)`) and avoid
calling `process_free()` at all in the transports code. Instead we just
call `process_terminate()` and let the process exit callback in
`managed_proxy_exit_callback()` handle the `process_free()` call by
returning true to the process subsystem.

See: https://bugs.torproject.org/29562
 2019-02-26 15:43:09 +01:00
Nick Mathewson 9049b545c2 Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-26 07:27:50 -05:00
Nick Mathewson 35257a1c69 Merge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0 2019-02-26 07:27:42 -05:00
Kris Katterjohn 1b9e77349f Fix some error-checking logic and a misleading error message 
When IPv4Only (IPv6Only) was used but the address could not be
interpreted as a IPv4 (IPv6) address, the error message referred
to the wrong IP version.

This also fixes up the error-checking logic so it's more precise
about what's being checked.

Fixes bug 13221; bugfix on 0.2.3.9-alpha

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
 2019-02-25 16:03:42 -06:00
Nick Mathewson 37698d92bb Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-21 13:25:39 -05:00
Nick Mathewson 1bff5646e6 Bump to 0.4.0.2-alpha-dev 2019-02-21 13:25:33 -05:00
Nick Mathewson 5f44e1e5dc Merge branch 'maint-0.3.5' into maint-0.4.0 
"ours" to avoid version bump.
 2019-02-21 13:25:02 -05:00
Nick Mathewson 955ca72f95 Bump to 0.3.5.8-dev 2019-02-21 13:24:42 -05:00
Nick Mathewson e1079266e7 Merge branch 'maint-0.3.4' into maint-0.3.5 
"ours" to avoid version bump.
 2019-02-21 13:23:52 -05:00
Nick Mathewson a56b9501f1 Bump to 0.3.4.11-dev 2019-02-21 13:23:46 -05:00
Nick Mathewson df70c44960 Merge branch 'maint-0.3.3' into maint-0.3.4 
"ours" to avoid version bump
 2019-02-21 13:23:22 -05:00
Nick Mathewson fb309f6eba Bump to 0.3.3.12-dev 2019-02-21 13:22:56 -05:00