Nick Mathewson
e13e9c40c8
Never emit the "opt" prefix in any directory stuff
...
Fix for bug 5124.
2012-06-28 15:47:07 -04:00
Nick Mathewson
1e008e9876
Make check-spaces happy again
2012-06-28 15:40:08 -04:00
Brendan C
a6169800f8
Fix bug 3842: add a GETINFO signal/names
...
Also refactor SIGNAL so that it and signal/names use the same table.
(commit message by nickm)
2012-06-28 15:39:19 -04:00
meejah
12298901fd
add new GETINFO config/defaults
...
returns the default values for every configuration item, similar
to GETINFO config/names; include a changes entry for it.
Fix for bug 4971
2012-06-28 15:15:51 -04:00
Nick Mathewson
58eb3e405d
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-28 11:05:52 -04:00
Nick Mathewson
aad40483b3
Clean up check-spaces block; make it cover the right files
2012-06-28 11:04:52 -04:00
Nick Mathewson
96746e39f6
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-28 10:57:23 -04:00
Nick Mathewson
217862b317
Merge remote-tracking branch 'public/bug6244_part2' into maint-0.2.3
2012-06-28 10:49:32 -04:00
Nick Mathewson
d4a64fdc02
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-28 10:48:06 -04:00
Nick Mathewson
dc9dd2324b
Add version and bug number to 5238 changes file
2012-06-28 10:45:56 -04:00
Andrea Shepard
bdc8270280
Downgrade 'Got a certificate, but we already have it' log message from warning to info, except when we're a dirauth (fixes bug 5238)
2012-06-28 10:42:43 -04:00
Nick Mathewson
5a73df0217
Merge branch 'sscanf_squashed'
2012-06-28 09:59:36 -04:00
Nick Mathewson
d4285f03df
Extend tor_sscanf so it can replace sscanf in rephist.c
...
Fixes bug 4195 and Coverity CID 448
2012-06-28 09:54:05 -04:00
Nick Mathewson
28c42fe029
Fix GETINFO address-mappings/... with wildcarded addresses.
2012-06-27 23:55:01 -04:00
Nick Mathewson
e12eba55b2
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-27 23:45:59 -04:00
Nick Mathewson
23f2e37ff7
Allow wildcarded mapaddress targets in controller MAPADDRESS command
2012-06-27 23:38:04 -04:00
Roger Dingledine
0b3f5ca11f
merge changes files into upcoming changelog
2012-06-27 21:32:17 -04:00
Nick Mathewson
86197dfd4f
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-26 11:04:43 -04:00
Nick Mathewson
6330d2d9e6
Merge remote-tracking branch 'public/bug6227' into maint-0.2.3
2012-06-26 11:03:56 -04:00
Nick Mathewson
05dd0a9cd9
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-26 11:03:32 -04:00
Nick Mathewson
5fad3dc36b
Fix a warning when using glibc's strcspn with clang.
...
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.
2012-06-26 11:02:44 -04:00
Nick Mathewson
9c8ec0aa20
Add a unit test for environment_variable_names_equal
...
I need this because I'm about to frob that function to stop using
strcspn() in order to get rid of a clang warning.
2012-06-26 10:50:37 -04:00
Nick Mathewson
201b852c27
Fix a compilation warning with clang 3.0
...
In b1ad1a1d02
we introduced an implicit (but safe)
long-to-int shortening that clang didn't like.
Warning not in any released version of Tor.
2012-06-26 10:48:31 -04:00
Nick Mathewson
4050800251
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-26 10:30:51 -04:00
Nick Mathewson
c4586f4df7
Downgrade message about md cache cleaning from notice to info
...
Fix for #6238
2012-06-26 10:30:11 -04:00
Nick Mathewson
4645f28c3b
Bump the test util/threads timeout up to 150 sec
...
This should make some debian build systems happier.
Also, increase the select() timeout to a more reasonable 100 msec.
2012-06-25 13:44:34 -04:00
Nick Mathewson
7c9f6a994f
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-25 13:23:07 -04:00
George Kadianakis
53e4452f98
Don't do DNS lookups when parsing corrupted managed proxy messages.
...
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.
2012-06-25 13:19:22 -04:00
Nick Mathewson
888d5d08fe
Merge remote-tracking branch 'public/bug2385'
2012-06-25 12:05:36 -04:00
Nick Mathewson
aad71eef1b
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-25 11:59:33 -04:00
Nick Mathewson
2703e072a1
Merge remote-tracking branch 'public/bug6225' into maint-0.2.3
2012-06-25 11:51:19 -04:00
Nick Mathewson
8e5d3cab26
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-23 15:54:33 -04:00
Nick Mathewson
a6688c574e
Catch a few more K&R violations with make check-spaces
...
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.
2012-06-23 15:54:01 -04:00
Roger Dingledine
95ad59fa79
Merge branch 'maint-0.2.3'
2012-06-23 15:46:29 -04:00
Roger Dingledine
ce44346aa5
fix broken utf8-ism
2012-06-23 15:42:18 -04:00
Nick Mathewson
db9ce36b25
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-23 15:37:57 -04:00
Nick Mathewson
ffd7189b3f
Don't assert in get_string_from_pipe() on len==0
...
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.
2012-06-23 15:35:43 -04:00
Nick Mathewson
b1ad1a1d02
Resolve crash caused by format_helper_exit_status changes in #5557
...
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.
2012-06-23 15:32:04 -04:00
Nick Mathewson
d0243e82cf
Merge branch 'bug5099_nm' into maint-0.2.3
2012-06-23 15:10:57 -04:00
Nick Mathewson
f54ac08846
Tweak bug5099 changes file
2012-06-23 15:10:43 -04:00
George Kadianakis
8c3a4a1d21
Improve log message issued when a managed proxy fails to launch.
2012-06-23 15:05:46 -04:00
Nick Mathewson
7761c1d6ac
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-22 22:41:12 -04:00
Nick Mathewson
ebda15e4b5
Merge remote-tracking branch 'public/bug6211' into maint-0.2.3
2012-06-22 22:38:59 -04:00
Nick Mathewson
a9de982c34
Merge remote-tracking branch 'public/bug6203_v2' into maint-0.2.3
2012-06-22 22:33:14 -04:00
Nick Mathewson
a08bbefa9b
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-22 22:23:20 -04:00
Nick Mathewson
4a7e4129af
Style tweaks and add a warning about NUL-termination
2012-06-22 22:21:20 -04:00
Andrea Shepard
770374a6b3
Add unit test for format_hex_number_for_helper_exit_status()
2012-06-22 22:21:20 -04:00
Andrea Shepard
c21af69f29
Refactor unsigned int hex formatting out of format_helper_exit_status() in util.c
2012-06-22 22:21:20 -04:00
Andrea Shepard
4c62cc6f99
Make format_helper_exit_status() avoid unnecessary spaces
2012-06-22 22:21:19 -04:00
Nick Mathewson
f96f319b9e
Increment master branch version to 0.2.4.0-alpha-dev
2012-06-20 16:41:31 -04:00