f00a8b4307
Another dirport/orport correction; this one from "cypherpunks"
2012-05-16 15:45:20 -04:00
400c7ce2b6
Document that the ORPort flags apply to DirPort too. (thanks, Roger.)
2012-05-16 15:07:54 -04:00
3c7c51ce07
5597: document new ORPort options
2012-05-16 14:54:16 -04:00
dfbe779a45
Clarify SessionGroup documentation. Bug 5437.
2012-05-16 14:43:11 -04:00
d732b87e60
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-16 12:20:56 -04:00
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
dd749798a4
Merge branch 'bug5346_squashed' into maint-0.2.2
2012-05-16 12:15:35 -04:00
679aa93e23
Fix month check in parse_http_time, add test
2012-05-16 12:15:13 -04:00
801923ac21
Remove more dubiosity in struct tm handling. related to bug5346
2012-05-16 12:15:08 -04:00
7ae798ac38
changes file for branch bug5346
2012-05-16 12:14:48 -04:00
1abe533b33
Reject an additional type of bad date in parse_http_time
2012-05-16 12:14:48 -04:00
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
3f55b76360
Merge remote-tracking branch 'public/bug5139'
2012-05-16 11:47:13 -04:00
70ffd3bc20
Add changes file for bug 4108
2012-05-16 11:44:23 -04:00
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
82ce43a706
Merge remote-tracking branch 'public/bug3964'
2012-05-16 11:33:52 -04:00
2cdd631f5c
Merge branch 'bug5380'
2012-05-16 11:31:40 -04:00
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
a6cb07bd9e
Correct documentation for remove_obsolete_entry_guards.
2012-05-16 11:31:28 -04:00
517b9c602a
Merge remote-tracking branch 'public/bug2297'
2012-05-16 11:14:00 -04:00
a925fc9189
Merge remote-tracking branch 'public/bug2822'
2012-05-16 11:10:09 -04:00
a3046fd5e5
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-16 10:57:08 -04:00
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
ee246bbe95
Merge remote-tracking branch 'public/bug3296'
2012-05-16 10:40:21 -04:00
891cf72f71
Merge branch 'bug5095_squashed'
2012-05-16 10:36:30 -04:00
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
d9ceab5bc3
Fix some remaining nmake/msvc build issues
2012-05-16 10:08:24 -04:00
d5ccaa6e2b
Merge branch 'win32_winnt'
2012-05-16 09:56:49 -04:00
1150b6b43e
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-15 11:23:06 -04:00
8e07798284
Clarify MaxCircuitDirtiness behavior with hidden services. Bug 5259.
2012-05-15 11:22:06 -04:00
521cb58187
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-15 10:05:19 -04:00
5905a0b2db
Merge branch 'bug5796_022_squashed' into maint-0.2.2
2012-05-15 10:04:49 -04:00
f2a6eedded
Fix a crash bug on SETCIRCUITPURPOSE.
2012-05-15 10:03:10 -04:00
92cba63459
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-15 10:01:12 -04:00
0be946c693
Merge remote-tracking branch 'karsten/geoip-may2012' into maint-0.2.2
2012-05-15 10:00:51 -04:00
009453f919
Merge remote-tracking branch 'linus/task-5891'
2012-05-15 08:33:08 -04:00
ad61282f0c
Clarify changes file regarding which bugs get fixed.
2012-05-15 13:31:54 +02:00
fd71fe78ae
Rename changes file.
2012-05-15 13:28:20 +02:00
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
57359b5336
Fix desc stats on bridge authorities that didn't serve anything.
2012-05-15 12:39:08 +02:00
21e3261914
Bump _WIN32_WINNT to 0x0501 throughout the code
...
This tells the windows headers to give us definitions that didn't
exist before XP -- like the ones that we need for IPv6 support.
See bug #5861 . We didn't run into this issue with mingw, since
mingw doesn't respect _WIN32_WINNT as well as it should for some of
its definitions.
2012-05-14 13:46:37 -04:00
9ffccb3f49
Remove all instances of WIN32_WINNT (without leading _)
...
We started adding it in 59e2c77824
2012-05-14 13:36:52 -04:00
ee1b8196d3
Add a changes file for the misc bug5859 build issues
2012-05-14 13:07:47 -04:00
d8de831932
MSVC build issue: it can't tell that tor_assert(0) aborts.
2012-05-14 13:07:27 -04:00
43e15300ba
MSVC build issue: make 'const' in declaration match 'const' in definition
...
MSVC warns if you declare a function as having a "int foo" argument
and then implement it with a "const int foo" argument, even though
the latter "const" is not a part of the function's interface.
2012-05-14 13:05:36 -04:00
757725ffde
MSVC build issue: we use INLINE as the one that will magically work
2012-05-14 13:04:37 -04:00
7134be0637
MSVC build issue: add magic to make openssl headers in aes.c work
2012-05-14 13:04:13 -04:00
02d206a58b
Be a good git person: store nmakefiles in correct text fmt
2012-05-14 13:01:05 -04:00
f1fca8aa4d
Remove the unused torrc.bridge.in. Bug 5622.
2012-05-14 12:37:39 -04:00
67690307fb
Add some MSVC stuff to gitignore
2012-05-14 12:35:10 -04:00
Nick Mathewson
Sebastian Hahn
Esteban Manchado Velázquez
Fabian Keil
Roger Dingledine
Linus Nordberg
Karsten Loesing