Nick Mathewson
61c0bae4f2
Merge branch 'bug19008_027' into maint-0.2.7
2016-05-09 18:14:27 -04:00
Nick Mathewson
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
Nick Mathewson
55cf1970bc
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-05-09 14:59:18 -04:00
Nick Mathewson
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
Nick Mathewson
7fe80c2905
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-05-09 14:56:56 -04:00
Nick Mathewson
0b477bfd55
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-05-09 14:55:45 -04:00
Nick Mathewson
368146370b
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-05-09 14:55:22 -04:00
Roger Dingledine
aa6341d4b9
stop looping once we know what the answer will be
...
suggested during code review by dgoulet
2016-05-09 14:42:42 -04:00
Roger Dingledine
1f72653544
fix a bug where relays would use the aggressive client bootstrapping retry number
2016-05-09 14:42:32 -04:00
Roger Dingledine
d5a96286c2
simplify more -- we only call these funcs when bootstrapping
2016-05-09 14:42:21 -04:00
Roger Dingledine
c98fbd4169
remove some more unused code
2016-05-09 14:42:09 -04:00
Roger Dingledine
bcae392e0e
avoid another redundant check
...
we should avoid launching a consensus fetch if we don't want one,
but if we do end up with an extra one, we should let the other checks
take care of it.
2016-05-09 14:41:54 -04:00
Roger Dingledine
e230e80ab3
get rid of the scattered checks to cancel a consensus fetch
...
We'll back off from the request in connection_ap_handshake_attach_circuit,
or cancel it in connection_dir_close_consensus_fetches, and those are the
only places we need to check.
2016-05-09 14:41:32 -04:00
Roger Dingledine
a7665df2f8
close other consensus fetches when we get a consensus
...
not once per second, and only do it when a consensus arrives
2016-05-09 14:41:14 -04:00
Roger Dingledine
59da060f10
use the new function here too
2016-05-09 14:40:54 -04:00
Roger Dingledine
91c58013be
avoid following through on a consensus fetch if we have one already arriving
2016-05-09 14:40:42 -04:00
Roger Dingledine
ce8266d52d
fix typos/etc before i go nuts on #18809
2016-05-09 14:40:21 -04:00
teor (Tim Wilson-Brown)
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
teor (Tim Wilson-Brown)
0c41ae1832
Add a comment to have_enough_path_info()
...
Comment only change
2016-05-09 14:26:13 -04:00
Karsten Loesing
3c2d4611ce
Update geoip and geoip6 to the May 4 2016 database.
2016-05-09 17:51:15 +02:00
teor (Tim Wilson-Brown)
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
teor (Tim Wilson-Brown)
225448ad34
Comment-only change to clarify routerstatus_t IPv4 byte order
2016-05-05 08:24:17 -04:00
teor (Tim Wilson-Brown)
7ec273bd4a
Rename skip_or and skip_dir to avoid confusion
...
Variable rename only
2016-05-05 08:24:17 -04:00
Nick Mathewson
68d913c49c
Merge branch 'feature18483-028-v2-squashed' into maint-0.2.8
2016-05-05 08:16:36 -04:00
teor (Tim Wilson-Brown)
9aa280cc0c
Only choose directory DirPorts on relays
2016-05-05 08:16:28 -04:00
teor (Tim Wilson-Brown)
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
teor (Tim Wilson-Brown)
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
teor (Tim Wilson-Brown)
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
Nick Mathewson
01e7f42a09
Merge branch 'bug18921_squashed' into maint-0.2.8
2016-05-04 15:23:26 -04:00
teor (Tim Wilson-Brown)
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
Nick Mathewson
60274296c3
Merge branch 'doc18312' into maint-0.2.8
2016-05-04 15:13:07 -04:00
Nick Mathewson
b8e8910d60
Merge branch 'bug18686_025' into maint-0.2.8
2016-05-04 15:12:11 -04:00
Nick Mathewson
c7b9e0b8ed
Report success when not terminating an already terminated process.
...
Also, document the actual behavior and return values of
tor_terminate_process.
Fixes bug18686; bugfix on 0.2.3.9-alpha.
2016-05-04 15:10:36 -04:00
Nick Mathewson
31332a878d
Merge branch 'bug18710_025' into maint-0.2.8
2016-05-04 14:47:04 -04:00
Scott Dial
0ca3f495c6
Fix dnsserv.c assertion when no supported questions are requested.
...
The problem is that "q" is always set on the first iteration even
if the question is not a supported question. This set of "q" is
not necessary, and will be handled after exiting the loop if there
if a supported q->type was found.
[Changes file by nickm]
lease enter the commit message for your changes. Lines starting
2016-05-04 14:45:09 -04:00
Yawning Angel
8f292f1c33
Fix keccak-tiny portability on exotic
platforms.
...
* SHA-3/SHAKE use little endian for certain things, so byteswap as
needed.
* The code was written under the assumption that unaligned access to
quadwords is allowed, which isn't true particularly on non-Intel.
2016-05-03 16:12:07 -04:00
s0rlxmh0
054d939853
(cherry-picked by nickm, with changes file from isis.)
2016-05-02 14:01:36 -04:00
teor (Tim Wilson-Brown)
ab06b79cba
Simplify string cleansing in fallback update script
...
No behavioural change
2016-04-29 11:59:46 +10:00
teor (Tim Wilson-Brown)
d41f92b006
Improve logging in fallback update script
...
Log a notice just before the script is about to perform a
potentially time-consuming operation
Clarify the warning when py2-ipaddress isn't found
Make log levels more consistent
No behavioural change (just logging)
2016-04-29 11:59:46 +10:00
teor (Tim Wilson-Brown)
46d813922a
Improve comments in fallback update script
2016-04-29 11:43:55 +10:00
teor (Tim Wilson-Brown)
b6ba6afa37
Refactor DirPort & begindir descriptor checks
...
No actual behaviour changes
2016-04-28 12:26:39 +10:00
teor (Tim Wilson-Brown)
211e56ad87
Remove redundant descriptor checks for OR/Dir reachability
...
The ORPort and DirPort must be reachable, or we won't publish a
descriptor.
2016-04-28 12:26:39 +10:00
teor (Tim Wilson-Brown)
b51316c0e7
Refactor common code out of reachability checks
...
No actual changes in behavior
2016-04-28 12:26:39 +10:00
teor (Tim Wilson-Brown)
d3c60f2bd7
Avoid checking ORPort reachability when the network is disabled
...
This is consistent with existing DirPort reachability checks.
2016-04-28 12:26:38 +10:00
teor (Tim Wilson-Brown)
2cfcf17cfc
Changes file for #18616
2016-04-28 12:26:38 +10:00
teor (Tim Wilson-Brown)
05cf286713
Make mock function static to prevent future clashes
2016-04-28 12:26:38 +10:00
teor (Tim Wilson-Brown)
75dd2a285b
Descriptors depend on more config options now they list begindir support
...
Bugfix on #12538 in 0.2.8.1-alpha.
2016-04-28 12:26:38 +10:00
teor (Tim Wilson-Brown)
692828bea5
Decide to advertise begindir support like we decide to advertise DirPort
...
Decide to advertise begindir support in a similar way to how
we decide to advertise DirPort.
Fix up the associated descriptor-building unit tests.
Resolves #18616 , bugfix on 0c8e042c30
in #12538 in 0.2.8.1-alpha.
2016-04-28 12:26:38 +10:00
Nick Mathewson
92615f608c
Do not recommend use of nicknames in MapAddress manpage
2016-04-26 20:30:59 -04:00
teor (Tim Wilson-Brown)
de08f2d96b
Whitelist additional fallbacks after creating April 2016 list
2016-04-26 19:26:22 -04:00