summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2017-11-21Merge branch 'ticket23953_033_squashed'Nick Mathewson
2017-11-21Use stdatomic.h for atomic_counter_t where available.Nick Mathewson
Closes ticket 23953.
2017-11-21Merge remote-tracking branch 'teor/bug24372'Nick Mathewson
2017-11-21Merge remote-tracking branch 'teor/bug23760_nc'Nick Mathewson
2017-11-21Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-21Merge branches 'bug24099_031' and 'bug24086_031' into maint-0.3.2Nick Mathewson
2017-11-21add an explanatory comment about the error codesNick Mathewson
2017-11-22Fix a confusing comment about tie-breaking in compute_routerstatus_consensus()teor
Closes bug 24372.
2017-11-22Introduce node_get_curve25519_onion_key() in extend_info_from_node()Neel Chauhan
2017-11-20Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-20Merge branch 'bug23817_031' into maint-0.3.2Nick Mathewson
2017-11-20Check number of usable guards when applying md restrictions.George Kadianakis
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-20Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-20Merge remote-tracking branches 'public/ticket24315_029' and ↵Nick Mathewson
'public/bug24198_029' into maint-0.3.2
2017-11-20Add another assertion to check for 24086 root causesNick Mathewson
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-20Correctly handle partial success in consensus diff calculation.Nick Mathewson
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-20Recover better from empty/invalid storagedir filesNick Mathewson
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-20In storagedir, take more care with errno on empty or mislabeled fileNick Mathewson
Required for 24099 fix -- we won't be able to act based on errno unless we can trust it.
2017-11-20Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-20Merge branch 'bug23681_029_01_squashed' into maint-0.3.2Nick Mathewson
2017-11-20circuit: Don't timeout opened C_INTRODUCING circuitDavid Goulet
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-18Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-18Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-18Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-11-18Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-11-18Move an assertion to make scan-build happy again.Nick Mathewson
2017-11-18Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-18Add an extra check in test_entrynodesNick Mathewson
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-18Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-18Fix memory leak in unit test for bridge distribution config.Nick Mathewson
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-17Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-17Fix a clang unitialized-var warningNick Mathewson
2017-11-17Intoduce unittest for skipping outdated dirservers.George Kadianakis
2017-11-17Fix a wide commentNick Mathewson
2017-11-17Merge branch 'bug23817_031' into maint-0.3.2Nick Mathewson
2017-11-17Make should_set_md_dirserver_restriction() look at num filtered guardsNick Mathewson
This seems closer to what the code intended.
2017-11-17Skip dirserver restrictions in small networks.George Kadianakis
2017-11-17Introduce new guard restriction and use it to skip outdated dirs.George Kadianakis
2017-11-17Introduce cache for outdated microdesc dirservers.George Kadianakis
We gonna use this cache to avoid dirservers without outdated md info.
2017-11-17Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-17Only log about lost KIST support onceMatt Traudt
2017-11-17Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-17Merge remote-tracking branch 'dgoulet/bug23861_032_01' into maint-0.3.2Nick Mathewson
2017-11-17Add error message for exit_node in hs_circ_send_introduce1()Neel Chauhan
2017-11-17Use memset() on intro1_data in hs_circ_send_introduce1()Neel Chauhan
2017-11-17Add smartlist_add() to get_lspecs_from_node)Neel Chauhan
2017-11-17Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-17Merge branch 'bug24167_025' into maint-0.3.2Nick Mathewson
2017-11-17Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-17Merge branch 'ticket24097_032' into maint-0.3.2Nick Mathewson