e47e60c12e
Merge branch 'pr_719_squashed'
2019-03-08 10:24:00 -05:00
cd67911033
Bug 29204: Inspect circuit queues before sending padding.
...
Mitigates OOM conditions at relays.
2019-03-08 10:23:47 -05:00
d3fc9aef93
Merge branch 'maint-0.4.0'
2019-03-07 08:57:02 -05:00
3af943dcd1
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0
2019-03-07 08:56:35 -05:00
918bda25ad
Merge branch 'maint-0.4.0'
2019-03-06 14:29:48 -05:00
9b4ecbaa7d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-06 14:29:43 -05:00
d6f77b99da
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-06 14:29:38 -05:00
155b0f5521
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-03-06 14:29:33 -05:00
0c9cd7c487
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-03-06 14:29:29 -05:00
2e74edb53e
Update geoip and geoip6 to the March 4 2019 database.
2019-03-06 11:45:27 +01:00
f1890707cc
Merge branch 'maint-0.4.0'
2019-03-05 13:00:07 -05:00
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
d24acc008d
Merge remote-tracking branch 'tor-github/pr/759'
2019-03-05 12:01:28 -05:00
72751f0c30
Merge remote-tracking branch 'tor-github/pr/680'
2019-03-05 11:53:31 -05:00
4578c3eb21
Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports too.
...
Closes #25614 .
2019-03-05 15:24:31 +01:00
c5da1f1cd5
Merge branch 'tor-github/pr/723'
2019-03-04 18:55:28 +02:00
fe2552ad65
Merge branch 'tor-github/pr/739'
2019-03-04 18:52:19 +02:00
13e93bdfd5
Merge branch 'tor-github/pr/718'
2019-03-01 09:36:23 -05:00
cb0d403049
Merge remote-tracking branch 'tor-github/pr/677'
2019-03-01 08:22:43 -05:00
64f594499a
Document crypto_fast_rng_one_in_n.
2019-03-01 08:20:54 -05:00
7786198eef
Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
2019-03-01 14:15:00 +10:00
c1ab538479
Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
2019-03-01 14:14:51 +10:00
ecbc2e80a0
Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9
2019-03-01 14:14:26 +10:00
389ee834b6
Log the correct "auto" port number for listening sockets
...
When "auto" was used for the port number for a listening socket, the
message logged after opening the socket would incorrectly say port 0
instead of the actual port used.
Fixes bug 29144; bugfix on 0.3.5.1-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-03-01 12:34:21 +10:00
d5f6137547
Merge branch 'maint-0.4.0'
2019-02-28 11:22:06 -05:00
dc19d65c3b
Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0
2019-02-28 11:20:26 -05:00
de0969ef78
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:49:33 +10:00
6a61a020ee
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:49:19 +10:00
be29dfedd9
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:45:59 +10:00
524731503e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:45:44 +10:00
3313444ef0
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-28 10:45:30 +10:00
c142e3d1e6
Set CIRCLAUNCH_NEED_UPTIME in rend_service_relaunch_rendezvous() on a hs_service_requires_uptime_circ()
2019-02-27 17:37:10 -05:00
761eb4cf79
Merge branch 'maint-0.4.0'
2019-02-27 09:59:42 -05:00
56f01e58b4
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0
2019-02-27 09:59:33 -05:00
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
64e082e892
Merge branch 'bug29599_029' into bug29599_033
2019-02-27 15:06:39 +10:00
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
15dc33849e
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-27 09:38:04 +10:00
1a194beb2c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-27 09:37:50 +10:00
6c966b894c
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-27 09:37:36 +10:00
b402a0887f
Merge branch 'tor-github/pr/655'
2019-02-26 11:30:44 -05:00
2a44ee9b8c
Merge branch 'maint-0.4.0'
2019-02-26 11:25:16 -05:00
a5dd41b9af
Merge branch 'tor-github/pr/638' into maint-0.4.0
2019-02-26 11:24:43 -05:00
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
732855c2e5
Merge branch 'maint-0.4.0'
2019-02-26 07:27:50 -05:00
35257a1c69
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0
2019-02-26 07:27:42 -05:00
57d33b5786
Merge branch 'tor-github/pr/698'
2019-02-26 12:35:14 +02:00
7fbfdf2af7
Merge branch 'tor-github/pr/611'
2019-02-26 12:33:23 +02:00
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
626e6d2c39
Merge remote-tracking branch 'tor-github/pr/684'
2019-02-25 13:33:39 -05:00
Nick Mathewson
Mike Perry
Karsten Loesing
David Goulet
David Fifield
George Kadianakis
teor
Kris Katterjohn
Neel Chauhan
Alexander Færøy