summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-05-31Merge remote-tracking branch 'public/close_file_mapping'Nick Mathewson
Conflicts: src/common/compat.h Conflict was between replacement of MS_WINDOWS with _WIN32 in master, and with removal of file_handle from tor_mmap_t struct in close_file_mapping branch (for bug 5951 fix).
2012-05-31reindent CreateFile arguments.Nick Mathewson
2012-05-31Merge remote-tracking branch 'linus/bug5355_ln'Nick Mathewson
2012-05-31Merge remote-tracking branch 'public/bug1938'Nick Mathewson
2012-05-31Merge remote-tracking branch 'public/bug2954_more'Nick Mathewson
2012-05-31Merge remote-tracking branch 'public/bug3196'Nick Mathewson
2012-05-31Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
(For bug 5969 fix)
2012-05-30Fix more clang format-nonliteral warnings (bug 5969)Nick Mathewson
2012-05-30Merge branch 'bug5604'Nick Mathewson
2012-05-30Add a little documentation for the bug5604 fixNick Mathewson
2012-05-30Merge remote-tracking branch 'public/bug5954'Nick Mathewson
2012-05-30Merge remote-tracking branch 'linus/bug4369'Nick Mathewson
2012-05-30Add __attribute__(format)s for our varargs printf/scanf wrappersNick Mathewson
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-30Fix clang 3.1 compile warning in crypto.cSebastian Hahn
(Tweaked by nickm)
2012-05-30Fix a typo in changes/bug5916Nick Mathewson
2012-05-30Merge remote-tracking branch 'public/bug5916'Nick Mathewson
2012-05-29Don't stomp on errno.Linus Nordberg
2012-05-29Fix minor typo in warning printout.Linus Nordberg
2012-05-24Abort writing cached-microdescs if a failed write has occurred.Nick Mathewson
Bug 2954; fix on 0.2.2.6-alpha.
2012-05-24New "GETINFO dormant" to report whether Tor has gone idleNick Mathewson
Torbutton needs this; see bug 5954 and 4718.
2012-05-24forward-port the 0.2.2.36 changelogRoger Dingledine
2012-05-23Close the windows file handle after CreateFileMapping; it isn't neededNick Mathewson
I did the changes file; the rest came pseudonymously
2012-05-18Fix the unittest breakage introduced by a8a862c.George Kadianakis
2012-05-18Merge remote-tracking branch 'asn/bug5602'Nick Mathewson
2012-05-18Fix a hard-to-trigger memory leak in launch_resolveNick Mathewson
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-18Merge remote-tracking branch 'asn/bug5646'Nick Mathewson
2012-05-18Extract data from DESTROY cell _after_ protocol violation checks.George Kadianakis
2012-05-18Ignore unknown lines from managed proxies.George Kadianakis
2012-05-18Use a more helpful log message when we can't find a proxy.George Kadianakis
2012-05-16Another dirport/orport correction; this one from "cypherpunks"Nick Mathewson
2012-05-16Document that the ORPort flags apply to DirPort too. (thanks, Roger.)Nick Mathewson
2012-05-165597: document new ORPort optionsNick Mathewson
2012-05-16Clarify SessionGroup documentation. Bug 5437.Nick Mathewson
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