summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-28
|\ \ \ \ | |/ / /
| * | | Add version and bug number to 5238 changes fileNick Mathewson2012-06-28
| | | |
| * | | Downgrade 'Got a certificate, but we already have it' log message from ↵Andrea Shepard2012-06-28
| |/ / | | | | | | | | | warning to info, except when we're a dirauth (fixes bug 5238)
* | | Merge branch 'sscanf_squashed'Nick Mathewson2012-06-28
|\ \ \
| * | | Extend tor_sscanf so it can replace sscanf in rephist.cNick Mathewson2012-06-28
|/ / / | | | | | | | | | Fixes bug 4195 and Coverity CID 448
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-27
|\ \ \ | |/ /
| * | Allow wildcarded mapaddress targets in controller MAPADDRESS commandNick Mathewson2012-06-27
| | |
| * | merge changes files into upcoming changelogRoger Dingledine2012-06-27
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-26
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'public/bug6227' into maint-0.2.3Nick Mathewson2012-06-26
| |\ \
| | * | Bump the test util/threads timeout up to 150 secNick Mathewson2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | This should make some debian build systems happier. Also, increase the select() timeout to a more reasonable 100 msec.
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-26
|\ \ \ \ | |/ / /
| * | | Fix a warning when using glibc's strcspn with clang.Nick Mathewson2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With glibc 2.15 and clang 3.0, I get warnings from where we use the strcpsn implementation in the header as strcspn(string, "="). This is apparently because clang sees that part of the strcspn macro expands to "="[2], and doesn't realize that that part of the macro is only evaluated when "="[1] != 0.
| * | | Add a unit test for environment_variable_names_equalNick Mathewson2012-06-26
| | | | | | | | | | | | | | | | | | | | I need this because I'm about to frob that function to stop using strcspn() in order to get rid of a clang warning.
| * | | Fix a compilation warning with clang 3.0Nick Mathewson2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In b1ad1a1d0266a20bb we introduced an implicit (but safe) long-to-int shortening that clang didn't like. Warning not in any released version of Tor.
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-26
|\ \ \ \ | |/ / /
| * | | Downgrade message about md cache cleaning from notice to infoNick Mathewson2012-06-26
| |/ / | | | | | | | | | Fix for #6238
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-25
|\ \ \ | |/ /
| * | Don't do DNS lookups when parsing corrupted managed proxy messages.George Kadianakis2012-06-25
| | | | | | | | | | | | | | | | | | The functions parse_{s,c}method_line() were using tor_addr_port_lookup() which is capable of doing DNS lookups. DNS lookups should not be necessary when parsing {C,S}METHOD lines.
* | | Merge remote-tracking branch 'public/bug2385'Nick Mathewson2012-06-25
|\ \ \
| * | | add bug number and explanation to changes/bug2385; call it a featureNick Mathewson2012-06-18
| | | |
| * | | Clear a couple more fields in rend_service_load_auth_keysNick Mathewson2012-06-18
| | | |
| * | | Refactor exit path in rend_service_load_auth_keysNick Mathewson2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | Now it's an orthodox "goto err/done" exit path, and it isn't some screwy thing where we stick err/done at the end of a loop and duplicate our cleanup code.
| * | | Fix indentation in rend_service_load_auth_keysNick Mathewson2012-06-18
| | | |
| * | | Refactor rend_service_load_keys() into main portion and auth portion.Nick Mathewson2012-06-18
| | | |
| * | | Fix indentation and whitespace in rend_service_load_keysNick Mathewson2012-06-18
| | | |
| * | | Refactor rend_service_load_keys() into outer loop and loop contentsNick Mathewson2012-06-18
| | | |
| * | | Add change file bug2385Andrea Shepard2012-06-15
| | | |
| * | | Appease make check-spacesAndrea Shepard2012-06-15
| | | |
| * | | Clean up keys on stack in rend_parse_service_authorization()Andrea Shepard2012-06-15
| | | |
| * | | Clean up keys on stack in rend_client_refetch_v2_renddesc()Andrea Shepard2012-06-15
| | | |
| * | | Clean up keys on stack in rend_client_send_introduction()Andrea Shepard2012-06-15
| | | |
| * | | In rend_service_load_keys(), clear extended descriptor cookie and buffer, ↵Andrea Shepard2012-06-15
| | | | | | | | | | | | | | | | clear temporary heap space for client key, and check if serializing client key fails
| * | | Clean keys on stack in rend_service_rendezvous_has_opened()Andrea Shepard2012-06-15
| | | |
| * | | Clean keys on stack in rend_service_intro_has_opened()Andrea Shepard2012-06-15
| | | |
| * | | Clean up keys on stack in rend_service_introduce()Andrea Shepard2012-06-15
| | | |
| * | | Clean up keys on stack in rend_service_load_keys()Andrea Shepard2012-06-15
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-25
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'public/bug6225' into maint-0.2.3Nick Mathewson2012-06-25
| |\ \ \
| | * | | Don't assert in get_string_from_pipe() on len==0Nick Mathewson2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can treat this case as an EAGAIN (probably because of an unexpected internal NUL) rather than a crash-worthy problem. Fixes bug 6225, again. Bug not in any released version of Tor.
| | * | | Resolve crash caused by format_helper_exit_status changes in #5557Nick Mathewson2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the string output was no longer equal in length to HEX_ERRNO_SIZE, the write() call would add some extra spaces and maybe a NUL, and the NUL would trigger an assert in get_string_from_pipe. Fixes bug 6225; bug not in any released version of Tor.
* | | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-23
|\ \ \ \ \ | |/ / / /
| * | | | Catch a few more K&R violations with make check-spacesNick Mathewson2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now catch bare {s that should be on the previous line with a do, while, if, or for, and elses that should share a line with their preceding }. That is, if (foo) { and if (foo) { ... } else are now detected. We should think about maybe making Tor uncrustify-clean some day, but configuring uncrustify is an exercise in bizarreness, and reformatting huge gobs of Tor is always painful.
* | | | | Merge branch 'maint-0.2.3'Roger Dingledine2012-06-23
|\ \ \ \ \ | |/ / / /
| * | | | fix broken utf8-ismRoger Dingledine2012-06-23
| |/ / /
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-23
|\ \ \ \ | |/ / /
| * | | Merge branch 'bug5099_nm' into maint-0.2.3Nick Mathewson2012-06-23
| |\ \ \
| | * | | Tweak bug5099 changes fileNick Mathewson2012-06-23
| | | | |
| | * | | Improve log message issued when a managed proxy fails to launch.George Kadianakis2012-06-23
| |/ / /
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-22
|\ \ \ \ | |/ / /