David Goulet
13e93bdfd5
Merge branch 'tor-github/pr/718'
2019-03-01 09:36:23 -05:00
Nick Mathewson
cb0d403049
Merge remote-tracking branch 'tor-github/pr/677'
2019-03-01 08:22:43 -05:00
Nick Mathewson
64f594499a
Document crypto_fast_rng_one_in_n.
2019-03-01 08:20:54 -05:00
teor
2d5c6cddc4
Merge branch 'maint-0.4.0'
2019-03-01 14:17:54 +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
David Goulet
9256b02cc8
maint: Remove 0.3.3 branch from git scripts
...
It is EOL today: Febuary 28th, 2019
No more releases will occur.
Closes #29616
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-28 13:16:41 -05:00
Nick Mathewson
d5f6137547
Merge branch 'maint-0.4.0'
2019-02-28 11:22:06 -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
George Kadianakis
cec555f44c
Merge branch 'tor-github/pr/720'
2019-02-28 12:32:16 +02:00
teor
600f5f0db4
Merge branch 'maint-0.4.0'
2019-02-28 10:50:01 +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
065cfc473b
Merge branch 'maint-0.4.0'
2019-02-28 10:46:29 +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
761eb4cf79
Merge branch 'maint-0.4.0'
2019-02-27 09:59:42 -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
ef12ab83c0
Merge branch 'maint-0.4.0'
2019-02-27 09:38:33 +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
George Kadianakis
39a1049932
Merge branch 'tor-github/pr/729'
2019-02-26 20:15:40 +02:00
David Goulet
b402a0887f
Merge branch 'tor-github/pr/655'
2019-02-26 11:30:44 -05:00
David Goulet
2a44ee9b8c
Merge branch 'maint-0.4.0'
2019-02-26 11:25:16 -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
3ac8cdb8cf
Merge branch 'maint-0.4.0'
2019-02-26 10:53:09 -05:00
David Goulet
e1ad22643e
maint: Helpful scripts for tor maintenance
...
Closes #29391
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-26 10:52:25 -05:00
David Goulet
ec695755e7
Merge branch 'maint-0.3.5'
2019-02-26 10:48:14 -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
732855c2e5
Merge branch 'maint-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
George Kadianakis
57d33b5786
Merge branch 'tor-github/pr/698'
2019-02-26 12:35:14 +02:00
George Kadianakis
7fbfdf2af7
Merge branch 'tor-github/pr/611'
2019-02-26 12:33:23 +02:00
