548d14247e
Merge remote-tracking branch 'arma/bug18616-v4' into maint-0.2.8
2016-05-17 10:48:12 -04:00
06031b441e
touchups and refactorings on bug 18616 branch
...
no behavior changes
2016-05-16 17:43:47 -04:00
6cc3397e26
Merge remote-tracking branch 'teor/fallback-script' into maint-0.2.8
2016-05-16 08:33:17 -04:00
e8cc9f3edf
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-05-12 15:33:47 -04:00
4165b1a0da
Merge branch 'bug18977_026_v2' into maint-0.2.7
2016-05-12 15:33:35 -04:00
20b01cece8
Merge branch 'bug18977_024_v2' into bug18977_026_v2
...
Had conflicts related to other correct_tm bugs in 0.2.6. Added wday
for another case.
2016-05-12 14:39:06 -04:00
e57f26c135
Have correct_tm set tm_wday as well.
...
The tm_wday field had been left uninitialized, which was causing
some assertions to fail on Windows unit tests.
Fixes bug 18977.
2016-05-12 14:37:27 -04:00
ce6f2d1c4d
Merge remote-tracking branch 'arma/bug19003-try2' into maint-0.2.8
2016-05-12 11:09:33 -04:00
d00d3f1c28
Merge remote-tracking branch 'arma/bug17621-try2' into maint-0.2.8
2016-05-12 10:03:00 -04:00
4a62d7aabc
minor touchups on nick's ticket 17621 changes
2016-05-11 16:35:36 -04:00
af4b7d0405
Document the contents of $datadir/keys
...
Ticket 17621.
2016-05-11 14:03:34 -04:00
163cee1b64
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-05-11 13:42:40 -04:00
d40e8695f4
unbreak the build (when warnings are enabled)
2016-05-11 13:42:00 -04:00
8d962233f6
Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8
2016-05-11 13:20:51 -04:00
24fbb9a81b
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-05-11 13:15:17 -04:00
4e94580591
Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7
2016-05-11 13:13:23 -04:00
bf3e32a452
Fix out-of-bounds write during voting with duplicate ed25519 keys
...
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 26e8974213a31e72
2016-05-11 13:11:03 -04:00
797ece042d
Confim we want certificates from fallbacks
...
Comment-only change
2016-05-11 13:08:45 -04:00
2cbad2aac7
Revert "Switch between fallback and authority when auth cert fetch fails"
...
This reverts commit 92d7ee08b8
2016-05-11 13:06:13 -04:00
b8b5bccfd9
refactor the #19003 patches
...
fix the logic in one of the comments
2016-05-11 13:03:49 -04:00
28e1aa1118
Merge branch 'bug18761_028_squashed' into maint-0.2.8
2016-05-11 12:36:27 -04:00
b59d79134e
Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN.
...
Closes ticket 18761.
Also fix a whitespace issue.
2016-05-11 12:36:19 -04:00
e71dfb6344
Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8
2016-05-11 12:28:37 -04:00
50249c7cd9
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-05-11 12:23:20 -04:00
039fc8427a
Merge branch 'bug18841_1_025' into maint-0.2.7
2016-05-11 12:22:36 -04:00
c662bef455
Undefine _FORTIFY_SOURCE before defining it.
...
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-11 12:15:37 -04:00
92d7ee08b8
Switch between fallback and authority when auth cert fetch fails
2016-05-10 11:25:55 -04:00
64b948f5fa
Use the consensus download schedule for authority certificates
...
Previously, we were using the generic schedule for some downloads,
and the consensus schedule for others.
Resolves ticket 18816; fix on fddb814fe
2016-05-10 11:25:50 -04:00
5cd5979132
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-05-09 18:14:44 -04:00
61c0bae4f2
Merge branch 'bug19008_027' into maint-0.2.7
2016-05-09 18:14:27 -04:00
85c698da72
Add "-c 1" to ping6 in test-network-all
...
Fixes bug 19008. bugfix on 0.2.7.3-rc
2016-05-09 18:12:59 -04:00
55cf1970bc
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-05-09 14:59:18 -04:00
72601d7e21
Merge commit '1a065cea46a9c179d64d74d012f051135bc4725a' into maint-0.2.8
...
This is an merge of maint-0.2.7 as an "ours" merge to avoid taking the
cherry-picked fix of 18490
2016-05-09 14:58:38 -04:00
7fe80c2905
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-05-09 14:56:56 -04:00
0b477bfd55
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-05-09 14:55:45 -04:00
368146370b
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-05-09 14:55:22 -04:00
c2817774c2
Allow directories in small networks to bootstrap
...
Skip DirPort checks when the consensus has no exits.
Resolves #19003 , bugfix on #18050 in 0.2.8.1-alpha.
2016-05-09 14:29:07 -04:00
0c41ae1832
Add a comment to have_enough_path_info()
...
Comment only change
2016-05-09 14:26:13 -04:00
3c2d4611ce
Update geoip and geoip6 to the May 4 2016 database.
2016-05-09 17:51:15 +02:00
03fc4cf04c
Refactor router_pick_directory_server_impl to use node functions
...
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-05 08:24:17 -04:00
225448ad34
Comment-only change to clarify routerstatus_t IPv4 byte order
2016-05-05 08:24:17 -04:00
7ec273bd4a
Rename skip_or and skip_dir to avoid confusion
...
Variable rename only
2016-05-05 08:24:17 -04:00
68d913c49c
Merge branch 'feature18483-028-v2-squashed' into maint-0.2.8
2016-05-05 08:16:36 -04:00
9aa280cc0c
Only choose directory DirPorts on relays
2016-05-05 08:16:28 -04:00
88deb52d55
Make clients only select directories with reachable ORPorts
...
This makes sure clients will only select relays which support
begindir over ORPort.
2016-05-05 08:16:28 -04:00
833b5f71a7
Make clients always use begindir for directory requests
...
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-05 08:16:28 -04:00
2e5b35db81
Make directory node selection more reliable
...
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-05 11:54:53 +10:00
01e7f42a09
Merge branch 'bug18921_squashed' into maint-0.2.8
2016-05-04 15:23:26 -04:00
0cf90bac2a
Choose the correct address for one-hop connections
...
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-04 15:23:14 -04:00
60274296c3
Merge branch 'doc18312' into maint-0.2.8
2016-05-04 15:13:07 -04:00
Nick Mathewson
Roger Dingledine
John Brooks
teor (Tim Wilson-Brown)
Karsten Loesing