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
26,717 Commits 53 Branches 631 Tags
e4b68abd5accdf41c71644eb728ca42991bf632a
Commit Graph
26717 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson e4b68abd5a Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-21 12:54:47 -05:00
Nick Mathewson 5da6120e88 bump version to 0.3.2.5-alpha 2017-11-21 12:54:11 -05:00
Nick Mathewson c6365055a1 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-21 12:41:39 -05:00
Nick Mathewson ba94dc28e8 Merge branches 'bug24099_031' and 'bug24086_031' into maint-0.3.2 2017-11-21 12:37:46 -05:00
Nick Mathewson ea13a47791 add an explanatory comment about the error codes 2017-11-21 12:36:32 -05:00
Nick Mathewson b9be385fd6 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-20 14:35:26 -05:00
Nick Mathewson da82e0b579 Merge branch 'bug23817_031' into maint-0.3.2 2017-11-20 14:29:50 -05:00
George Kadianakis 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
Nick Mathewson e343cb8f63 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-20 14:25:17 -05:00
Nick Mathewson e2d8300c10 Merge branch 'bug23783' into maint-0.3.2 2017-11-20 14:25:12 -05:00
Nick Mathewson 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
Nick Mathewson 1bd83c2ec8 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-20 13:22:10 -05:00
Nick Mathewson 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
Nick Mathewson 68c21860e3 Add another assertion to check for 24086 root causes 
In cdm_diff_ht_set_status(), we shouldn't have been allowing the
status CDM_DIFF_PRESENT to be set if there wasn't actually a handle.
 2017-11-20 11:06:31 -05:00
Nick Mathewson 3bb29dd707 Correctly handle partial success in consensus diff calculation. 
Previously, if store_multiple() reported a partial success, we would
store all the handles it gave us as if they had succeeded.  But it's
possible for the diff to be only partially successful -- for
example, if LZMA failed but the other compressors succeeded.

Fixes bug 24086; bugfix on 0.3.1.1-alpha.
 2017-11-20 11:04:37 -05:00
Nick Mathewson c8ee12b2e8 Recover better from empty/invalid storagedir files 
If we can't read a file because of an FS issue, we say "we can't
read that" and move on.  But if we can't read it because it's empty,
because it has no labels, or because its labels are misformatted, we
should remove it.

Fixes bug 24099; bugfix on 0.3.1.1-alpha.
 2017-11-20 10:14:41 -05:00
Nick Mathewson cabcb752d7 In storagedir, take more care with errno on empty or mislabeled file 
Required for 24099 fix -- we won't be able to act based on errno
unless we can trust it.
 2017-11-20 10:10:13 -05:00
Nick Mathewson 9096454492 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-20 08:39:39 -05:00
Nick Mathewson e0f7a2dbd4 Merge branch 'bug23681_029_01_squashed' into maint-0.3.2 2017-11-20 08:39:34 -05:00
David Goulet 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
Nick Mathewson e74229efc4 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-18 11:03:16 -05:00
Nick Mathewson 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
Nick Mathewson 7358559524 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-11-18 11:02:42 -05:00
Nick Mathewson 2d849716df Merge branch 'maint-0.2.9' into maint-0.3.0 2017-11-18 11:02:08 -05:00
Nick Mathewson 53c3174ee4 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-11-18 11:01:43 -05:00
Nick Mathewson d388f9d879 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-11-18 11:01:33 -05:00
Nick Mathewson 831d3b794d Merge branch 'ticket18329_minimal_025' into maint-0.2.5 2017-11-18 11:00:45 -05:00
Nick Mathewson 41a3eaf2fc Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-18 10:27:29 -05:00
Nick Mathewson 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
Nick Mathewson 9afa661924 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-18 10:23:52 -05:00
Nick Mathewson 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
Nick Mathewson cf92667b9f Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-17 09:59:26 -05:00
Nick Mathewson 9c17a6d28b Merge branch 'bug23817_tests_032' into maint-0.3.2 2017-11-17 09:58:12 -05:00
Nick Mathewson 3a5ca47d8f Fix a clang unitialized-var warning 2017-11-17 09:57:52 -05:00
George Kadianakis 7e52947d57 Intoduce unittest for skipping outdated dirservers. 2017-11-17 09:57:46 -05:00
Nick Mathewson 9fbc835f10 Fix a wide comment 2017-11-17 09:57:15 -05:00
Nick Mathewson 2cee26b164 Merge branch 'bug23817_031' into maint-0.3.2 2017-11-17 09:56:53 -05:00
Nick Mathewson 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
George Kadianakis c400ffc2e8 Skip dirserver restrictions in small networks. 2017-11-17 09:52:41 -05:00
George Kadianakis f61e3090fb Introduce new guard restriction and use it to skip outdated dirs. 2017-11-17 09:52:40 -05:00
George Kadianakis 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
Nick Mathewson 330ccb699e Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-17 09:26:11 -05:00
Matt Traudt b98614f1af Only log about lost KIST support once 2017-11-17 09:25:47 -05:00
Matt Traudt 8b2c01a46f Use less jargon in Scheduler sec. of man page 2017-11-17 09:25:07 -05:00
Matt Traudt 3537f7801d Add notes about OS support for our scheduler types 2017-11-17 09:25:01 -05:00
Nick Mathewson b2e1910017 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-17 09:23:07 -05:00
Nick Mathewson 85778dc92d Merge remote-tracking branch 'dgoulet/bug23861_032_01' into maint-0.3.2 2017-11-17 09:23:04 -05:00
Nick Mathewson 00aeecb397 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-17 08:35:56 -05:00
Nick Mathewson 3a364309ac Merge branch 'bug24167_025' into maint-0.3.2 2017-11-17 08:35:52 -05:00
Nick Mathewson b9826ba451 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-17 08:35:04 -05:00