03b18f6288
Fix a confusing comment about tie-breaking in compute_routerstatus_consensus()
...
Closes bug 24372.
2017-11-22 02:27:28 +11:00
b1ab360eca
Merge branch 'maint-0.3.2'
2017-11-20 14:35:26 -05:00
da82e0b579
Merge branch 'bug23817_031' into maint-0.3.2
2017-11-20 14:29:50 -05:00
69f93f806c
Check number of usable guards when applying md restrictions.
...
We used to check whether we have enough filtered guards (guard set when
torrc is applied) but that's not good enough, since that might be bad in
some cases where many guards are not reachable (might cause overblocking
and hence reacahbility issues).
We now check if we have enough reachable filtered guards before applying
md restrictions which should prevent overblocking.
2017-11-20 14:28:56 -05:00
9068e55ce8
Merge branch 'maint-0.3.2'
2017-11-20 14:25:17 -05:00
e2d8300c10
Merge branch 'bug23783' into maint-0.3.2
2017-11-20 14:25:12 -05:00
1bf36c1837
Include ws2_32 when trying to link openssl on windows in autoconf
...
Fixes bug 23783; bugfix on 0.3.2.2-alpha when we started looking for
TLSv1_1_method().
2017-11-20 13:37:22 -05:00
729f9a286c
Merge branch 'maint-0.3.2'
2017-11-20 13:22:10 -05:00
846df5b3cd
Merge remote-tracking branches 'public/ticket24315_029' and 'public/bug24198_029' into maint-0.3.2
2017-11-20 13:20:25 -05:00
04812e59df
Merge branch 'maint-0.3.2'
2017-11-20 08:39:39 -05:00
e0f7a2dbd4
Merge branch 'bug23681_029_01_squashed' into maint-0.3.2
2017-11-20 08:39:34 -05:00
981bb60575
circuit: Don't timeout opened C_INTRODUCING circuit
...
A circuit with purpose C_INTRODUCING means that its state is opened but the
INTRODUCE1 cell hasn't been sent yet. We shouldn't consider that circuit when
looking for timing out "building circuit". We have to wait on the rendezvous
circuit to be opened before sending that cell so the intro circuit needs to be
kept alive for at least that period of time.
This patch makes that the purpose C_INTRODUCING is ignored in the
circuit_expire_building() which means that we let the circuit idle timeout
take care of it if we end up never using it.
Fixes #23681
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-11-20 08:33:44 -05:00
2e590bac97
Remove changes files that have already been merged in 0.3.2.x
2017-11-18 11:23:41 -05:00
fd40be15ef
Merge branch 'maint-0.3.2'
2017-11-18 11:03:16 -05:00
65a6103afc
Merge branch 'maint-0.3.1' into maint-0.3.2
...
"Ours" merge to avoid taking ticket18329_minimal_025
2017-11-18 11:02:58 -05:00
7358559524
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-18 11:02:42 -05:00
2d849716df
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-18 11:02:08 -05:00
53c3174ee4
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-18 11:01:43 -05:00
d388f9d879
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-18 11:01:33 -05:00
831d3b794d
Merge branch 'ticket18329_minimal_025' into maint-0.2.5
2017-11-18 11:00:45 -05:00
43e0472fcf
Move an assertion to make scan-build happy again.
2017-11-18 10:51:23 -05:00
7813b0e0ed
Merge branch 'maint-0.3.2'
2017-11-18 10:27:29 -05:00
d45bf0c65c
Add an extra check in test_entrynodes
...
This check makes it so we can reach "done" without setting "conn",
and so the "if (conn)" check will not be redundant, and so coverity
won't complain. Fixes CID 1422205. Not actually a bug.
2017-11-18 10:26:45 -05:00
b9bce4288e
Merge branch 'maint-0.3.2'
2017-11-18 10:23:52 -05:00
a5b8b55c1c
Fix memory leak in unit test for bridge distribution config.
...
Also, check for the actual message, and fix some string confusion,
while we're at it.
Fixes bug 24345; bugfix on 0.3.2.3-alpha.
2017-11-18 10:22:14 -05:00
fcdec00685
Merge branch 'maint-0.3.2'
2017-11-17 09:59:26 -05:00
9c17a6d28b
Merge branch 'bug23817_tests_032' into maint-0.3.2
2017-11-17 09:58:12 -05:00
3a5ca47d8f
Fix a clang unitialized-var warning
2017-11-17 09:57:52 -05:00
7e52947d57
Intoduce unittest for skipping outdated dirservers.
2017-11-17 09:57:46 -05:00
9fbc835f10
Fix a wide comment
2017-11-17 09:57:15 -05:00
2cee26b164
Merge branch 'bug23817_031' into maint-0.3.2
2017-11-17 09:56:53 -05:00
96b69942a5
Make should_set_md_dirserver_restriction() look at num filtered guards
...
This seems closer to what the code intended.
2017-11-17 09:52:41 -05:00
c400ffc2e8
Skip dirserver restrictions in small networks.
2017-11-17 09:52:41 -05:00
f61e3090fb
Introduce new guard restriction and use it to skip outdated dirs.
2017-11-17 09:52:40 -05:00
7fc64f02a3
Introduce cache for outdated microdesc dirservers.
...
We gonna use this cache to avoid dirservers without outdated md info.
2017-11-17 09:52:40 -05:00
94dce246ee
Merge branch 'maint-0.3.2'
2017-11-17 09:26:11 -05:00
b98614f1af
Only log about lost KIST support once
2017-11-17 09:25:47 -05:00
8b2c01a46f
Use less jargon in Scheduler sec. of man page
2017-11-17 09:25:07 -05:00
3537f7801d
Add notes about OS support for our scheduler types
2017-11-17 09:25:01 -05:00
cfacd44240
Merge branch 'maint-0.3.2'
2017-11-17 09:23:07 -05:00
85778dc92d
Merge remote-tracking branch 'dgoulet/bug23861_032_01' into maint-0.3.2
2017-11-17 09:23:04 -05:00
eb793c31cf
Add error message for exit_node in hs_circ_send_introduce1()
2017-11-17 08:42:07 -05:00
b8addf9746
Use memset() on intro1_data in hs_circ_send_introduce1()
2017-11-17 08:42:07 -05:00
27d34f36e0
Add smartlist_add() to get_lspecs_from_node)
2017-11-17 08:42:07 -05:00
368dc1003e
Merge branch 'maint-0.3.2'
2017-11-17 08:35:56 -05:00
3a364309ac
Merge branch 'bug24167_025' into maint-0.3.2
2017-11-17 08:35:52 -05:00
4ef70ff389
Merge branch 'maint-0.3.2'
2017-11-17 08:35:04 -05:00
0571015819
Merge branch 'ticket24097_032' into maint-0.3.2
2017-11-17 08:35:01 -05:00
4b56df9874
Merge branch 'maint-0.3.2'
2017-11-17 08:34:23 -05:00
0684e6c6f0
Merge branch 'bug20963_032' into maint-0.3.2
2017-11-17 08:34:05 -05:00
teor
Nick Mathewson
George Kadianakis
David Goulet
Matt Traudt
Neel Chauhan