Nick Mathewson
e31980f693
Merge branch 'maint-0.2.8'
2016-05-11 12:23:40 -04:00
Nick Mathewson
50249c7cd9
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-05-11 12:23:20 -04:00
Nick Mathewson
039fc8427a
Merge branch 'bug18841_1_025' into maint-0.2.7
2016-05-11 12:22:36 -04:00
Nick Mathewson
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
Nick Mathewson
84af12e9db
Merge remote-tracking branch 'arma/feature18998'
2016-05-09 21:10:17 -04:00
Roger Dingledine
be0e1e9e2f
Stop being so strict about the payload length of "rendezvous1" cells
...
We used to be locked in to the "tap" handshake length, and now we can
handle better handshakes like "ntor".
Resolves ticket 18998.
I checked that relay_send_command_from_edge() behaves fine when you
hand it a payload with length 0. Clients behave fine too, since current
clients remain strict about the required length in the rendezvous2 cells.
(Clients will want to become less strict once they have an alternate
format that they're willing to receive.)
2016-05-09 20:34:27 -04:00
John Brooks
6678dff386
Add changes file for #15588
2016-05-09 18:59:56 -04:00
Nick Mathewson
2c15a06597
Merge branch 'maint-0.2.8'
2016-05-09 18:14:54 -04:00
Nick Mathewson
5cd5979132
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-05-09 18:14:44 -04:00
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
7fa11a92d5
Merge branch 'maint-0.2.8'
2016-05-09 14:59:47 -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
Nick Mathewson
33d3572a1d
Merge branch 'feature15588_squashed'
2016-05-09 14:41:36 -04:00
John Brooks
162aa14eef
Move rend client name checks to one function
2016-05-09 14:30:34 -04:00
John Brooks
dcc11674db
Add client auth for ADD_ONION services
2016-05-09 14:28:58 -04:00
John Brooks
d15354c73b
Add client auth to rend_service_add_ephemeral
2016-05-09 14:28:08 -04:00
John Brooks
d5a23ce115
Move rend auth cookie en-/decoding to a function
...
Tor stores client authorization cookies in two slightly different forms.
The service's client_keys file has the standard base64-encoded cookie,
including two chars of padding. The hostname file and the client remove
the two padding chars, and store an auth type flag in the unused bits.
The distinction makes no sense. Refactor all decoding to use the same
function, which will accept either form, and use a helper function for
encoding the truncated format.
2016-05-09 14:28:08 -04:00
Nick Mathewson
69380033d6
Merge branch 'timeouts_v2_squashed'
2016-05-09 14:06:10 -04:00
Nick Mathewson
af132fc299
timer tests: differences in timing accuracy can be negative.
...
Also, use symbolic names for good-enough thresholds for timer accuracy.
2016-05-09 14:04:54 -04:00
Nick Mathewson
0a2f59aaa6
give it a changes file too
2016-05-09 14:04:54 -04:00
Nick Mathewson
11a09778d6
Test coverage for timers.
2016-05-09 14:04:54 -04:00
Nick Mathewson
10fd4535c2
Fix an OSX/clang compilation warning
2016-05-09 14:04:54 -04:00
Nick Mathewson
118556e4b3
Quick-and-dirty test for timers code.
2016-05-09 14:04:53 -04:00
Nick Mathewson
dcf948da06
Add wrappers to tie the new timeouts into libevent.
2016-05-09 14:04:06 -04:00
John Brooks
e7ff23beea
Make rend_authorized_client_free public
...
This is needed by control.c.
Also, check whether client_name is set before doing memwipe.
2016-05-09 13:53:24 -04:00
John Brooks
896271d525
Use uint8_t for rend descriptor_cookie fields
2016-05-09 13:53:09 -04:00
Karsten Loesing
3c2d4611ce
Update geoip and geoip6 to the May 4 2016 database.
2016-05-09 17:51:15 +02:00
Nick Mathewson
641cdc345c
Merge branch 'maint-0.2.8'
2016-05-05 08:25:27 -04: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
2da2718609
Merge branch 'maint-0.2.8'
2016-05-04 15:23:38 -04: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
27c1b0ea43
Merge branch 'maint-0.2.8'
2016-05-04 15:13:15 -04:00
Nick Mathewson
60274296c3
Merge branch 'doc18312' into maint-0.2.8
2016-05-04 15:13:07 -04:00
Nick Mathewson
2384256a37
Merge branch 'maint-0.2.8'
2016-05-04 15:12:20 -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
e24c902272
Merge branch 'maint-0.2.8'
2016-05-04 14:47:13 -04:00
