summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-05-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-05-16Make the succeeding parse_http_time tests more obviously rightNick Mathewson
(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-16Merge branch 'bug5346_squashed' into maint-0.2.2Nick Mathewson
2012-05-16Fix month check in parse_http_time, add testSebastian Hahn
2012-05-16Remove more dubiosity in struct tm handling. related to bug5346Nick Mathewson
2012-05-16changes file for branch bug5346Nick Mathewson
2012-05-16Reject an additional type of bad date in parse_http_timeNick Mathewson
2012-05-16Fix parse_http_time and add testsEsteban Manchado Velázquez
* 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-16Merge remote-tracking branch 'public/bug5139'Nick Mathewson
2012-05-16Add changes file for bug 4108Nick Mathewson
2012-05-16In connection_ap_handshake_process_socks(), mark the socks request as ↵Fabian Keil
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-16Merge remote-tracking branch 'public/bug3964'Nick Mathewson
2012-05-16Merge branch 'bug5380'Nick Mathewson
2012-05-16Remove over-two-months-old entry guards even while running.Roger Dingledine
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-16Correct documentation for remove_obsolete_entry_guards.Nick Mathewson
2012-05-16Merge remote-tracking branch 'public/bug2297'Nick Mathewson
2012-05-16Merge remote-tracking branch 'public/bug2822'Nick Mathewson
2012-05-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-05-16Correct the bulletproofing of routerlist_insert()Nick Mathewson
The original code updated some variables, but forgot to remove a replaced old-routerdesc from rl->old_routers. Related to bug 1776.
2012-05-16Merge remote-tracking branch 'public/bug3296'Nick Mathewson
2012-05-16Merge branch 'bug5095_squashed'Nick Mathewson
2012-05-16When ReloadTorrcOnSIGHUP=1, do non-reload activities anywayNick Mathewson
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-16Fix some remaining nmake/msvc build issuesNick Mathewson
2012-05-16Merge branch 'win32_winnt'Nick Mathewson
2012-05-15Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-05-15Clarify MaxCircuitDirtiness behavior with hidden services. Bug 5259.Nick Mathewson
2012-05-15Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-05-15Merge branch 'bug5796_022_squashed' into maint-0.2.2Nick Mathewson
2012-05-15Fix a crash bug on SETCIRCUITPURPOSE.Nick Mathewson
2012-05-15Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-05-15Merge remote-tracking branch 'karsten/geoip-may2012' into maint-0.2.2Nick Mathewson
2012-05-15Merge remote-tracking branch 'linus/task-5891'Nick Mathewson
2012-05-15Clarify changes file regarding which bugs get fixed.Linus Nordberg
2012-05-15Rename changes file.Linus Nordberg
2012-05-15Assert that rep_hist_format_desc_stats() returns !NULL.Linus Nordberg
The guard against this is the test for start_of_served_descs_stats_interval != 0 done earlier.
2012-05-15Fix desc stats on bridge authorities that didn't serve anything.Karsten Loesing
2012-05-14Bump _WIN32_WINNT to 0x0501 throughout the codeNick Mathewson
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-14Remove all instances of WIN32_WINNT (without leading _)Nick Mathewson
We started adding it in 59e2c77824840f back in 2004, 8 years and 3 days ago. It's time to deprogram ourselves from this cargo cult.
2012-05-14Add a changes file for the misc bug5859 build issuesNick Mathewson
2012-05-14MSVC build issue: it can't tell that tor_assert(0) aborts.Nick Mathewson
2012-05-14MSVC build issue: make 'const' in declaration match 'const' in definitionNick Mathewson
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-14MSVC build issue: we use INLINE as the one that will magically workNick Mathewson
2012-05-14MSVC build issue: add magic to make openssl headers in aes.c workNick Mathewson
2012-05-14Be a good git person: store nmakefiles in correct text fmtNick Mathewson
2012-05-14Remove the unused torrc.bridge.in. Bug 5622.Nick Mathewson
2012-05-14Add some MSVC stuff to gitignoreNick Mathewson
2012-05-14We do not need to define _WIN32 by hand; MSVC does that for usNick Mathewson
Bug 5858; fix on 0.2.3.12-alpha
2012-05-14Fix win32 compilation of 31eb73f88e8Nick Mathewson
2012-05-11Do not publish the "git-XXX" tag in server descriptorsNick Mathewson
Instead, allow packagers to put a 'TOR_BUILD_TAG' field in the server descriptor to indicate a platform-specific value, if they need to. (According to weasel, this was his use for the git- tag previously.) This is part of 2988
2012-05-11Cut down on the OS information we give.Nick Mathewson
For uname-based detection, we now give only the OS name (e.g., "Darwin", "Linux".) For Windows, we give only the Operating System name as inferred from dw(Major|Minor)version, (e.g., "Windows XP", "Windows 7"), and whether the VER_NT_SERVER flag is set. For ticket 2988.