Neel Chauhan
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
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
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
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
626e6d2c39
Merge remote-tracking branch 'tor-github/pr/684'
2019-02-25 13:33:39 -05:00
Nick Mathewson
69238ca2da
Merge remote-tracking branch 'tor-github/pr/646'
2019-02-24 17:17:16 -05:00
Nick Mathewson
34601105a3
Merge branch 'ticket29065_squashed'
2019-02-24 17:02:35 -05:00
rl1987
b7dced893a
Fix shellcheck SC2006 warnings in test_switch_id.sh
2019-02-24 17:02:06 -05:00
Neel Chauhan
df8ad64735
When a DirAuth checks reachability on itself and has IPv6, mark it as reachable
2019-02-22 13:36:02 -05:00
George Kadianakis
f229a33685
Merge remote-tracking branch 'nickm/thread_rng'
2019-02-22 16:07:57 +02:00
Nick Mathewson
9ac8c85435
Merge branch 'maint-0.4.0'
...
"ours" to avoid version bump.
2019-02-21 13:25:54 -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
Nick Mathewson
658770a0f0
Remove changes entries for fixes that appeared in 0.4.0.2-alpha
2019-02-21 10:33:16 -05:00
Nick Mathewson
85e1c49378
Copy today's releases into changelogs and releasenotes.
2019-02-21 10:32:08 -05:00
Nick Mathewson
00a93b19cf
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-02-21 10:08:14 -05:00
Nick Mathewson
4a8a1f76ea
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-21 10:08:14 -05:00
Nick Mathewson
5062647918
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-21 10:08:14 -05:00
Nick Mathewson
54e42fe364
Merge branch 'maint-0.4.0'
2019-02-21 10:08:14 -05:00
David Goulet
be84ed1a64
kist: Don't write above the highwater outbuf mark
...
KIST works by computing how much should be allowed to write to the kernel for
a given socket, and then it writes that amount to the outbuf.
The problem is that it could be possible that the outbuf already has lots of
data in it from a previous scheduling round (because the kernel is full/busy
and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf
has been filling (is above its "highwater") and writes more anyway. The end
result is that the outbuf length would exceed INT_MAX, hence causing an
assertion error and a corresponding "Bug()" message to get printed to the
logs.
This commit makes it for KIST to take into account the outbuf length when
computing the available space.
Bug found and patch by Rob Jansen.
Closes #29168 . TROVE-2019-001.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-21 10:07:34 -05:00
Nick Mathewson
d04f6d9dff
Merge branch 'maint-0.4.0'
...
"ours" to avoid version bump
2019-02-21 09:52:35 -05:00
Nick Mathewson
df3484b2b0
Bump version to 0.4.0.2-alpha
2019-02-21 09:52:27 -05:00
Nick Mathewson
332fe15679
Merge branch 'maint-0.3.5' into maint-0.4.0
...
"ours" to avoid version bump.
2019-02-21 09:51:38 -05:00