Nick Mathewson
f1aae1236f
Merge remote-tracking branch 'linus/bug5355_ln'
2012-05-31 12:33:16 -04:00
Nick Mathewson
155543d26e
Merge remote-tracking branch 'public/bug1938'
2012-05-31 12:24:02 -04:00
Nick Mathewson
11bf5585aa
Merge remote-tracking branch 'public/bug2954_more'
2012-05-31 12:22:02 -04:00
Nick Mathewson
32d6acade8
Merge remote-tracking branch 'public/bug3196'
2012-05-31 01:02:27 -04:00
Nick Mathewson
ffc21b653f
Merge remote-tracking branch 'origin/maint-0.2.2'
...
(For bug 5969 fix)
2012-05-31 00:07:52 -04:00
Nick Mathewson
3a9351b57e
Fix more clang format-nonliteral warnings (bug 5969)
2012-05-30 23:59:49 -04:00
Nick Mathewson
fe68a80f8f
Merge branch 'bug5604'
2012-05-30 17:00:36 -04:00
Nick Mathewson
d7e4777791
Add a little documentation for the bug5604 fix
2012-05-30 17:00:22 -04:00
Nick Mathewson
37f42c2f58
Merge remote-tracking branch 'public/bug5954'
2012-05-30 16:38:20 -04:00
Nick Mathewson
711e4b4237
Merge remote-tracking branch 'linus/bug4369'
2012-05-30 13:05:15 -04:00
Nick Mathewson
e284894672
Add __attribute__(format)s for our varargs printf/scanf wrappers
...
It turns out that if you set the third argument of
__attribute__(format) to 0, GCC and Clang will check the format
argument without expecting to find variadic arguments. This is the
correct behavior for vsnprintf, vasprintf, and vscanf.
I'm hoping this will fix bug 5969 (a clang warning) by telling clang that
the format argument to tor_vasprintf is indeed a format string.
2012-05-30 12:14:38 -04:00
Sebastian Hahn
a5a8296892
Fix clang 3.1 compile warning in crypto.c
...
(Tweaked by nickm)
2012-05-30 11:56:43 -04:00
Nick Mathewson
bf16e167f7
Fix a typo in changes/bug5916
2012-05-30 11:18:49 -04:00
Nick Mathewson
9e53cdca86
Merge remote-tracking branch 'public/bug5916'
2012-05-30 11:14:41 -04:00
Linus Nordberg
f998590e5b
Don't stomp on errno.
2012-05-29 15:38:03 +02:00
Linus Nordberg
2f0c0f92f8
Fix minor typo in warning printout.
2012-05-29 15:03:22 +02:00
Nick Mathewson
0da40bba88
Abort writing cached-microdescs if a failed write has occurred.
...
Bug 2954; fix on 0.2.2.6-alpha.
2012-05-24 11:07:01 -04:00
Nick Mathewson
2418bc9594
New "GETINFO dormant" to report whether Tor has gone idle
...
Torbutton needs this; see bug 5954 and 4718.
2012-05-24 10:42:55 -04:00
Roger Dingledine
5e805ff1f2
forward-port the 0.2.2.36 changelog
2012-05-24 04:12:29 -04:00
George Kadianakis
ec7fd08ccf
Fix the unittest breakage introduced by a8a862c
.
2012-05-18 20:52:24 +03:00
Nick Mathewson
466276faa5
Merge remote-tracking branch 'asn/bug5602'
2012-05-18 12:36:04 -04:00
Nick Mathewson
4c4dd505be
Fix a hard-to-trigger memory leak in launch_resolve
...
To hit this leak, you need to be a relay that gets a RESOLVE request
or an exit node getting a BEGIN or RESOLVE request. You must either
have unconfigured (and unconfigurable) nameservers, or you must have
somehow set DisableNetwork after a network request arrived but
before you managed to process it.
So, I doubt this is reached often. Still, a leak's a leak. Fix for
bug 5916; bugfix on 0.2.3.9-alpha and 0.1.2.1-alpha.
2012-05-18 12:21:46 -04:00
Nick Mathewson
c1da29e22d
Merge remote-tracking branch 'asn/bug5646'
2012-05-18 12:10:40 -04:00
George Kadianakis
153b9892f0
Extract data from DESTROY cell _after_ protocol violation checks.
2012-05-18 15:22:03 +03:00
George Kadianakis
a8a862c909
Ignore unknown lines from managed proxies.
2012-05-18 15:04:48 +03:00
George Kadianakis
5dc9acb5e5
Use a more helpful log message when we can't find a proxy.
2012-05-18 03:07:46 +03:00
Nick Mathewson
f00a8b4307
Another dirport/orport correction; this one from "cypherpunks"
2012-05-16 15:45:20 -04:00
Nick Mathewson
400c7ce2b6
Document that the ORPort flags apply to DirPort too. (thanks, Roger.)
2012-05-16 15:07:54 -04:00
Nick Mathewson
3c7c51ce07
5597: document new ORPort options
2012-05-16 14:54:16 -04:00
Nick Mathewson
dfbe779a45
Clarify SessionGroup documentation. Bug 5437.
2012-05-16 14:43:11 -04:00
Nick Mathewson
d732b87e60
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-16 12:20:56 -04:00
Nick Mathewson
75fc4dbbca
Make the succeeding parse_http_time tests more obviously right
...
(When the correct answer is given in terms of seconds since the
epoch, it's hard to be sure that it really is the right answer
just by reading the code.)
2012-05-16 12:19:56 -04:00
Nick Mathewson
dd749798a4
Merge branch 'bug5346_squashed' into maint-0.2.2
2012-05-16 12:15:35 -04:00
Sebastian Hahn
679aa93e23
Fix month check in parse_http_time, add test
2012-05-16 12:15:13 -04:00
Nick Mathewson
801923ac21
Remove more dubiosity in struct tm handling. related to bug5346
2012-05-16 12:15:08 -04:00
Nick Mathewson
7ae798ac38
changes file for branch bug5346
2012-05-16 12:14:48 -04:00
Nick Mathewson
1abe533b33
Reject an additional type of bad date in parse_http_time
2012-05-16 12:14:48 -04:00
Esteban Manchado Velázquez
d0d9c3d71e
Fix parse_http_time and add tests
...
* It seems parse_http_time wasn't parsing correctly any date with commas (RFCs
1123 and 850). Fix that.
* It seems parse_http_time was reporting the wrong month (they start at 0, not
1). Fix that.
* Add some tests for parse_http_time, covering all three formats.
2012-05-16 12:14:48 -04:00
Nick Mathewson
3f55b76360
Merge remote-tracking branch 'public/bug5139'
2012-05-16 11:47:13 -04:00
Nick Mathewson
70ffd3bc20
Add changes file for bug 4108
2012-05-16 11:44:23 -04:00
Fabian Keil
2888644a9f
In connection_ap_handshake_process_socks(), mark the socks request as finished if a reply is send after a parse error
...
Silences the log message:
[warn] {BUG} _connection_mark_unattached_ap(): Bug: stream (marked at connection_edge.c:2224) sending two socks replies?
after the client triggered the "Tor is not an HTTP Proxy" response.
No additional socks reply was sent, though.
2012-05-16 11:37:31 -04:00
Nick Mathewson
82ce43a706
Merge remote-tracking branch 'public/bug3964'
2012-05-16 11:33:52 -04:00
Nick Mathewson
2cdd631f5c
Merge branch 'bug5380'
2012-05-16 11:31:40 -04:00
Roger Dingledine
f89de0a79f
Remove over-two-months-old entry guards even while running.
...
Previously, we only did this check at startup, which could lead to
us holding a guard indefinitely, and give weird results. Fixes bug
5380; bugfix on 0.2.1.14-rc.
(Patch by Roger; changes file and commit message by Nick)
2012-05-16 11:31:28 -04:00
Nick Mathewson
a6cb07bd9e
Correct documentation for remove_obsolete_entry_guards.
2012-05-16 11:31:28 -04:00
Nick Mathewson
517b9c602a
Merge remote-tracking branch 'public/bug2297'
2012-05-16 11:14:00 -04:00
Nick Mathewson
a925fc9189
Merge remote-tracking branch 'public/bug2822'
2012-05-16 11:10:09 -04:00
Nick Mathewson
a3046fd5e5
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-16 10:57:08 -04:00
Nick Mathewson
3ed4c5dc05
Correct the bulletproofing of routerlist_insert()
...
The original code updated some variables, but forgot to remove a
replaced old-routerdesc from rl->old_routers.
Related to bug 1776.
2012-05-16 10:51:02 -04:00
Nick Mathewson
ee246bbe95
Merge remote-tracking branch 'public/bug3296'
2012-05-16 10:40:21 -04:00