summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2017-11-15Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-15Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2Nick Mathewson
2017-11-14Remove remove_file_if_very_old() -- nothing calls it.Nick Mathewson
2017-11-14Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-14Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2Nick Mathewson
2017-11-14Silence a warning about failed descriptor uploads.George Kadianakis
Due to #23662 this can happen under natural causes and does not disturb the functionality of the service. This is a simple 0.3.2 fix for now, and we plan to fix this properly in 0.3.3.
2017-11-13Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-13Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-11-13hs-v3: Fix consensus param "hsdir-interval" nameDavid Goulet
The dir-spec.txt specifies it to be "hsdir_interval" (underscore). Fixes #24262 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-13Merge remote-tracking branch 'sebastian/bug24137'Nick Mathewson
2017-11-13Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2Nick Mathewson
2017-11-13Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-13Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-13Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9Nick Mathewson
2017-11-13Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-13Merge branch 'bug8185_025' into maint-0.2.9Nick Mathewson
2017-11-13Merge branch 'bug8185_031' into maint-0.3.1Nick Mathewson
2017-11-13Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-13Merge branch 'ticket21953_029' into maint-0.2.9Nick Mathewson
2017-11-13Add corresponding rust-c coupling comments to CNick Mathewson
2017-11-13Merge remote-tracking branch 'chelseakomlo/24032-cargo-rust-sync'Nick Mathewson
2017-11-12Make node_get_curve25519_onion_key() return a const ptrNick Mathewson
2017-11-12Merge branch 'bug23577_squashed'Nick Mathewson
2017-11-12Make setup_introduce1_data() take a node_t instead of an extend_info_tNeel Chauhan
Clients add rendezvous point IPv6 addresses to introduce cell link specifiers, when the node has a valid IPv6 address. Also check the node's IPv4 address is valid before adding any link specifiers. Implements #23577.
2017-11-12Introduce node_get_curve25519_onion_key()Neel Chauhan
2017-11-11annotate where C and Rust need to stay in syncChelsea Holland Komlo
2017-11-11Merge branch 'bug24247_032'Nick Mathewson
2017-11-11Fix mock_crypto_pk_public_checksig__nocheck() to handle short RSA keysNick Mathewson
This function -- a mock replacement used only for fuzzing -- would have a buffer overflow if it got an RSA key whose modulus was under 20 bytes long. Fortunately, Tor itself does not appear to have a bug here. Fixes bug 24247; bugfix on 0.3.0.3-alpha when fuzzing was introduced. Found by OSS-Fuzz; this is OSS-Fuzz issue 4177.
2017-11-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-11-11Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-11Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-11Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-11-11Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-11-10control: Fix wrong Action on failure to upload an HS descriptorDavid Goulet
On failure to upload, the HS_DESC event would report "UPLOAD_FAILED" as the Action but it should have reported "FAILED" according to the spec. Fixes #24230 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-10Update geoip and geoip6 to the November 6 2017 database.Karsten Loesing
2017-11-09slight improvement to rust idiomicityNick Mathewson
2017-11-09Rust implementation of protocol_list_supports_protocol_or_later()Nick Mathewson
2017-11-09Fix unit test behavior: we need to be in STATE_LIVE.Nick Mathewson
2017-11-09Merge branch 'ticket12062_squashed'Nick Mathewson
2017-11-09Audit all of the "is the network turned off" checks.Nick Mathewson
DisableNetwork is a subset of net_is_disabled(), which is (now) a subset of should_delay_dir_fetches(). Some of these changes are redundant with others higher or lower in the call stack. The ones that I think are behavior-relevant are listed in the changes file. I've also added comments in a few places where the behavior is subtle. Fixes bug 12062; bugfix on various versions.
2017-11-09Merge branch 'ticket20895'Nick Mathewson
2017-11-09Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-09Merge branch 'bug23985_029' into maint-0.3.2Nick Mathewson
2017-11-09Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-09Re-remove AllowDotExit deprecation.Nick Mathewson
This was accidentally reintroduced in 5a46074e55. It should be harmless, though: the option is obsolete, so calling it deprecated is redundant.
2017-11-08bump to 0.3.2.4-alpha-devNick Mathewson
2017-11-08Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-08dirauth: Recalculate voting schedule at first voteDavid Goulet
Commit e67f4441eb2646368e3e7cb1bcee403667b786f0 introduced a safeguard against using an uninitialized voting schedule object. However, the dirvote_act() code was looking roughly at the same thing to know if it had to compute the timings before voting with this condition: if (!voting_schedule.voting_starts) { ... dirvote_recalculate_timing(options, now); } The sr_init() function is called very early and goes through the safeguard thus the voting schedule is always initilized before the first vote. That first vote is a crucial one because we need to have our voting schedule aligned to the "now" time we are about to use for voting. Then, the schedule is updated when we publish our consensus or/and when we set a new consensus. From that point on, we only want to update the voting schedule through that code flow. This "created_on_demand" is indicating that the timings have been recalculated on demand by another subsystem so if it is flagged, we know that we need to ignore its values before voting. Fixes #24186 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-08Merge branch 'maint-0.3.2'Nick Mathewson