summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add changes file for #15588feature15588-changesJohn Brooks2016-05-09
|
* Merge branch 'maint-0.2.8'Nick Mathewson2016-05-09
|\
| * Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson2016-05-09
| |\
| | * Merge branch 'bug19008_027' into maint-0.2.7Nick Mathewson2016-05-09
| | |\
| | | * Add "-c 1" to ping6 in test-network-allNick Mathewson2016-05-09
| | |/ | | | | | | | | | Fixes bug 19008. bugfix on 0.2.7.3-rc
* | | Merge branch 'maint-0.2.8'Nick Mathewson2016-05-09
|\ \ \ | |/ /
| * | Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson2016-05-09
| |\ \ | | |/
| | * Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson2016-05-09
| | |\
| | | * Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson2016-05-09
| | | |\
| | | | * Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson2016-05-09
| | | | |\
| | | | | * Update geoip and geoip6 to the May 4 2016 database.Karsten Loesing2016-05-09
| | | | | |
| * | | | | Merge commit '1a065cea46a9c179d64d74d012f051135bc4725a' into maint-0.2.8Nick Mathewson2016-05-09
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | This is an merge of maint-0.2.7 as an "ours" merge to avoid taking the cherry-picked fix of 18490
| | * | | | Do not link tests against both libor.a and libor-testing.aNick Mathewson2016-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, put libor-testing.a at a better position in the list of libraries, to avoid linker errors. This is a fix, or part of a fix, for 18490. Conflicts: src/test/include.am
* | | | | | Merge branch 'feature15588_squashed'Nick Mathewson2016-05-09
|\ \ \ \ \ \
| * | | | | | Move rend client name checks to one functionJohn Brooks2016-05-09
| | | | | | |
| * | | | | | Add client auth for ADD_ONION servicesJohn Brooks2016-05-09
| | | | | | |
| * | | | | | Add client auth to rend_service_add_ephemeralJohn Brooks2016-05-09
| | | | | | |
| * | | | | | Move rend auth cookie en-/decoding to a functionJohn Brooks2016-05-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Make rend_authorized_client_free publicJohn Brooks2016-05-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed by control.c. Also, check whether client_name is set before doing memwipe.
| * | | | | | Use uint8_t for rend descriptor_cookie fieldsJohn Brooks2016-05-09
| | | | | | |
* | | | | | | Merge branch 'timeouts_v2_squashed'Nick Mathewson2016-05-09
|\ \ \ \ \ \ \
| * | | | | | | timer tests: differences in timing accuracy can be negative.Nick Mathewson2016-05-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, use symbolic names for good-enough thresholds for timer accuracy.
| * | | | | | | give it a changes file tooNick Mathewson2016-05-09
| | | | | | | |
| * | | | | | | Test coverage for timers.Nick Mathewson2016-05-09
| | | | | | | |
| * | | | | | | Fix an OSX/clang compilation warningNick Mathewson2016-05-09
| | | | | | | |
| * | | | | | | Quick-and-dirty test for timers code.Nick Mathewson2016-05-09
| | | | | | | |
| * | | | | | | Add wrappers to tie the new timeouts into libevent.Nick Mathewson2016-05-09
| | | | | | | |
| * | | | | | | Quick function to find out the timeout object's view of "now"Nick Mathewson2016-04-15
| | | | | | | |
| * | | | | | | Fix compilation of timeout.c with our flags and warnings.Nick Mathewson2016-04-15
| | | | | | | |
| * | | | | | | Add timeouts to libor-event.aNick Mathewson2016-04-15
| | | | | | | |
| * | | | | | | Import timeouts.c directly from William Ahern's git.Nick Mathewson2016-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imported from here: https://github.com/wahern/timeout Imported as of upstream e5a9e8bfaa9c631bdc54002181795931b65bdc1a. All sources unmodified.
* | | | | | | | Merge branch 'maint-0.2.8'Nick Mathewson2016-05-05
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Refactor router_pick_directory_server_impl to use node functionsteor (Tim Wilson-Brown)2016-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Comment-only change to clarify routerstatus_t IPv4 byte orderteor (Tim Wilson-Brown)2016-05-05
| | | | | | | |
| * | | | | | | Rename skip_or and skip_dir to avoid confusionteor (Tim Wilson-Brown)2016-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Variable rename only
| * | | | | | | Merge branch 'feature18483-028-v2-squashed' into maint-0.2.8Nick Mathewson2016-05-05
| |\ \ \ \ \ \ \
| | * | | | | | | Only choose directory DirPorts on relaysteor (Tim Wilson-Brown)2016-05-05
| | | | | | | | |
| | * | | | | | | Make clients only select directories with reachable ORPortsteor (Tim Wilson-Brown)2016-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure clients will only select relays which support begindir over ORPort.
| | * | | | | | | Make clients always use begindir for directory requeststeor (Tim Wilson-Brown)2016-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Make directory node selection more reliableteor (Tim Wilson-Brown)2016-05-05
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge branch 'maint-0.2.8'Nick Mathewson2016-05-04
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'bug18921_squashed' into maint-0.2.8Nick Mathewson2016-05-04
| |\ \ \ \ \ \ \
| | * | | | | | | Choose the correct address for one-hop connectionsteor (Tim Wilson-Brown)2016-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge branch 'maint-0.2.8'Nick Mathewson2016-05-04
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'doc18312' into maint-0.2.8Nick Mathewson2016-05-04
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Do not recommend use of nicknames in MapAddress manpageNick Mathewson2016-04-26
| | |/ / / / / / /
* | | | | | | | | Merge branch 'maint-0.2.8'Nick Mathewson2016-05-04
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'bug18686_025' into maint-0.2.8Nick Mathewson2016-05-04
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Report success when not terminating an already terminated process.Nick Mathewson2016-05-04
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, document the actual behavior and return values of tor_terminate_process. Fixes bug18686; bugfix on 0.2.3.9-alpha.
* | | | | | | | | Merge branch 'maint-0.2.8'Nick Mathewson2016-05-04
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /