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
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
Nick Mathewson
891cf72f71
Merge branch 'bug5095_squashed'
2012-05-16 10:36:30 -04:00
Nick Mathewson
b41dd8069f
When ReloadTorrcOnSIGHUP=1, do non-reload activities anyway
...
Previously, we skipped everything that got invoked from
options_init_from_torrc. But some of the stuff in
options_act_reversible and options_act is actually important, like
reopening the logs.
Now, a SIGHUP always makes the effects of an options_set() happen,
even though the options haven't changed.
Fix for bug 5095; bugfix on 0.2.1.9-alpha, which introduced
__ReloadTorrcOnSIGHUP.
2012-05-16 10:36:21 -04:00
Nick Mathewson
d9ceab5bc3
Fix some remaining nmake/msvc build issues
2012-05-16 10:08:24 -04:00
Nick Mathewson
d5ccaa6e2b
Merge branch 'win32_winnt'
2012-05-16 09:56:49 -04:00
Nick Mathewson
1150b6b43e
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-15 11:23:06 -04:00
Nick Mathewson
8e07798284
Clarify MaxCircuitDirtiness behavior with hidden services. Bug 5259.
2012-05-15 11:22:06 -04:00
Nick Mathewson
521cb58187
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-15 10:05:19 -04:00
Nick Mathewson
5905a0b2db
Merge branch 'bug5796_022_squashed' into maint-0.2.2
2012-05-15 10:04:49 -04:00
Nick Mathewson
f2a6eedded
Fix a crash bug on SETCIRCUITPURPOSE.
2012-05-15 10:03:10 -04:00
Nick Mathewson
92cba63459
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-15 10:01:12 -04:00
Nick Mathewson
0be946c693
Merge remote-tracking branch 'karsten/geoip-may2012' into maint-0.2.2
2012-05-15 10:00:51 -04:00
Nick Mathewson
009453f919
Merge remote-tracking branch 'linus/task-5891'
2012-05-15 08:33:08 -04:00
Linus Nordberg
ad61282f0c
Clarify changes file regarding which bugs get fixed.
2012-05-15 13:31:54 +02:00
Linus Nordberg
fd71fe78ae
Rename changes file.
2012-05-15 13:28:20 +02:00
Linus Nordberg
e3716598fc
Assert that rep_hist_format_desc_stats() returns !NULL.
...
The guard against this is the test for
start_of_served_descs_stats_interval != 0 done earlier.
2012-05-15 13:12:34 +02:00
