summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-17Fix remaining lintChanges warnings.Nick Mathewson
2016-05-17Resolve lintChanges warnings.Nick Mathewson
2016-05-16Merge remote-tracking branch 'teor/fallback-script' into maint-0.2.8Nick Mathewson
2016-05-12Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-05-12Merge branch 'bug18977_026_v2' into maint-0.2.7Nick Mathewson
2016-05-12Merge branch 'bug18977_024_v2' into bug18977_026_v2Nick Mathewson
Had conflicts related to other correct_tm bugs in 0.2.6. Added wday for another case.
2016-05-12Have correct_tm set tm_wday as well.Nick Mathewson
The tm_wday field had been left uninitialized, which was causing some assertions to fail on Windows unit tests. Fixes bug 18977.
2016-05-12Merge remote-tracking branch 'arma/bug19003-try2' into maint-0.2.8Nick Mathewson
2016-05-12Merge remote-tracking branch 'arma/bug17621-try2' into maint-0.2.8Nick Mathewson
2016-05-11minor touchups on nick's ticket 17621 changesRoger Dingledine
2016-05-11Document the contents of $datadir/keysNick Mathewson
Ticket 17621.
2016-05-11Merge branch 'maint-0.2.7' into maint-0.2.8Roger Dingledine
2016-05-11unbreak the build (when warnings are enabled)Roger Dingledine
2016-05-11Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8Nick Mathewson
2016-05-11Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-05-11Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7Nick Mathewson
2016-05-11Fix out-of-bounds write during voting with duplicate ed25519 keysJohn Brooks
In dirserv_compute_performance_thresholds, we allocate arrays based on the length of 'routers', a list of routerinfo_t, but loop over the nodelist. The 'routers' list may be shorter when relays were filtered by routers_make_ed_keys_unique, leading to an out-of-bounds write on directory authorities. This bug was originally introduced in 26e89742, but it doesn't look possible to trigger until routers_make_ed_keys_unique was introduced in 13a31e72. Fixes bug 19032; bugfix on tor 0.2.8.2-alpha.
2016-05-11Confim we want certificates from fallbacksteor (Tim Wilson-Brown)
Comment-only change
2016-05-11Revert "Switch between fallback and authority when auth cert fetch fails"teor (Tim Wilson-Brown)
This reverts commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b.
2016-05-11refactor the #19003 patchesRoger Dingledine
fix the logic in one of the comments
2016-05-11Merge branch 'bug18761_028_squashed' into maint-0.2.8Nick Mathewson
2016-05-11Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN.Nick Mathewson
Closes ticket 18761. Also fix a whitespace issue.
2016-05-11Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8Nick Mathewson
2016-05-11Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-05-11Merge branch 'bug18841_1_025' into maint-0.2.7Nick Mathewson
2016-05-11Undefine _FORTIFY_SOURCE before defining it.Nick Mathewson
This makes our compilation options checks in autoconf work better on systems that already define _FORTIFY_SOURCE. Fixes at least one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from "trudokal".
2016-05-10Switch between fallback and authority when auth cert fetch failsteor (Tim Wilson-Brown)
2016-05-10Use the consensus download schedule for authority certificatesteor (Tim Wilson-Brown)
Previously, we were using the generic schedule for some downloads, and the consensus schedule for others. Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha.
2016-05-09Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-05-09Merge branch 'bug19008_027' into maint-0.2.7Nick Mathewson
2016-05-09Add "-c 1" to ping6 in test-network-allNick Mathewson
Fixes bug 19008. bugfix on 0.2.7.3-rc
2016-05-09Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-05-09Merge commit '1a065cea46a9c179d64d74d012f051135bc4725a' into maint-0.2.8Nick Mathewson
This is an merge of maint-0.2.7 as an "ours" merge to avoid taking the cherry-picked fix of 18490
2016-05-09Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-05-09Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-05-09Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-05-09Allow directories in small networks to bootstrapteor (Tim Wilson-Brown)
Skip DirPort checks when the consensus has no exits. Resolves #19003, bugfix on #18050 in 0.2.8.1-alpha.
2016-05-09Add a comment to have_enough_path_info()teor (Tim Wilson-Brown)
Comment only change
2016-05-09Update geoip and geoip6 to the May 4 2016 database.Karsten Loesing
2016-05-05Refactor router_pick_directory_server_impl to use node functionsteor (Tim Wilson-Brown)
No behavioural change This makes the use of the node explicit in the function, rather than hiding the node lookup in fascist_firewall_allows_rs.
2016-05-05Comment-only change to clarify routerstatus_t IPv4 byte orderteor (Tim Wilson-Brown)
2016-05-05Rename skip_or and skip_dir to avoid confusionteor (Tim Wilson-Brown)
Variable rename only
2016-05-05Merge branch 'feature18483-028-v2-squashed' into maint-0.2.8Nick Mathewson
2016-05-05Only choose directory DirPorts on relaysteor (Tim Wilson-Brown)
2016-05-05Make clients only select directories with reachable ORPortsteor (Tim Wilson-Brown)
This makes sure clients will only select relays which support begindir over ORPort.
2016-05-05Make clients always use begindir for directory requeststeor (Tim Wilson-Brown)
This improves client anonymity and avoids directory header tampering. The extra load on the authorities should be offset by the fallback directories feature. This also simplifies the fixes to #18809.
2016-05-05Make directory node selection more reliableteor (Tim Wilson-Brown)
Delete an unnecessary check for non-preferred IP versions. Allows clients which can't reach any directories of their preferred IP address version to get directory documents. Patch on #17840 in 0.2.8.1-alpha.
2016-05-04Merge branch 'bug18921_squashed' into maint-0.2.8Nick Mathewson
2016-05-04Choose the correct address for one-hop connectionsteor (Tim Wilson-Brown)
After #17840 in 0.2.8.1-alpha, we incorrectly chose an IPv4 address for all DIRIND_ONEHOP directory connections, even if the routerstatus didn't have an IPv4 address. This likely affected bridge clients with IPv6 bridges. Resolves #18921.
2016-05-04Merge branch 'doc18312' into maint-0.2.8Nick Mathewson