summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-02-11Merge remote-tracking branch 'public/remove_freelist'Nick Mathewson
2015-02-11Merge branch 'bug12844'Nick Mathewson
Conflicts: src/or/circuituse.c src/test/include.am src/test/test_entrynodes.c
2015-02-11Additional paranoia: do not even build tor2web stuff if not using.Nick Mathewson
(That is, don't build it unless we're building for tor2web, or we are building for tests.)
2015-02-11Remove mempools and buf freelistsNick Mathewson
They have been off-by-default since 0.2.5 and nobody has complained. :) Also remove the buf_shrink() function, which hasn't done anything since we first stopped using contiguous memory to store buffers. Closes ticket 14848.
2015-02-11Merge remote-tracking branch 'public/feature_13555'Nick Mathewson
2015-02-11Merge remote-tracking branch 'sebastian/bug14819'Nick Mathewson
2015-02-09Merge remote-tracking branch 'sysrqb/bug14802_025'Nick Mathewson
2015-02-09Merge remote-tracking branch 'teor/avoid-NULL-smartlist-foreach'Nick Mathewson
2015-02-09Add some comments to or_circuit_t.workqueue_entrySebastian Hahn
These were suggested by dgoulet, thanks!
2015-02-09Avoid use-after-free of circ belonging to cancelled jobSebastian Hahn
This fixes a bug where we decide to free the circuit because it isn't on any workqueue anymore, and then the job finishes and the circuit gets freed again. Fixes bug #14815, not in any released version of Tor.
2015-02-09Re-remove the --disable-threads configure optionSebastian Hahn
2015-02-09Reserve enough space for rend_service_port_config_tSebastian Hahn
In #14803, Damian noticed that his Tor sometimes segfaults. Roger noted that his valgrind gave an invalid write of size one here. Whenever we use FLEXIBLE_ARRAY_MEMBER, we have to make sure to actually malloc a thing that's large enough. Fixes bug #14803, not in any released version of Tor.
2015-02-09Return 0 when detecting the amount of memory failsMatthew Finkel
Fixes bug 14802; bugfix on 0.2.5.4-alpha.
2015-02-08Avoid calling SMARTLIST_FOREACH on a NULL smartlist in teststeor
Check if each smartlist is NULL before calling SMARTLIST_FOREACH on it. Bug discovered by the clang static analyzer. Apple clang 600.0.56 (LLVM 3.5svn) on x86_64-apple-darwin14.1.0.
2015-02-06Control: getinfo entry-guards report down-sinceDavid Goulet
If the guard unreachable_since variable was set, the status "up" was reported which is wrong. This adds the "down" status followed by the unreachable_since time value. Fixes #14184 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-02-06Merge remote-tracking branch 'sebastian/bug13993'Nick Mathewson
2015-02-06Fix check-spaces complaintsSebastian Hahn
2015-02-06Avoid logging startup messages twiceSebastian Hahn
2015-02-06Add unit test for #13290Sebastian Hahn
2015-02-06Fix scheduler compilation on targets where char is unsigned.Yawning Angel
Per discussion with nickm, the `dir` argument should be a int rather than a signed char. Fixes bug #14764.
2015-02-05changes file for 13796Nick Mathewson
2015-02-05Merge remote-tracking branch 'public/bug13796'Nick Mathewson
2015-02-05Run the format_changelog script for initial cleanupNick Mathewson
2015-02-05Start working on an 0.2.3 changelogNick Mathewson
This is just sorting the entries and lightly editing a couple of problems I found.
2015-02-05Fix a work-counting bug introduced by the workqueue mergeNick Mathewson
David Goulet finds that when he runs a busy relay for a while with the latest version of the git code, the number of onionskins handled slowly dwindles to zero, with total_pending_tasks wedged at its maximum value. I conjecture this is because the total_pending_tasks variable isn't decremented when we successfully cancel a job. Fixed that. Fixes bug 14741; bugfix not on any released version of tor.
2015-02-05use ARRAY_LENGTH macro in domain_to_stringNick Mathewson
2015-02-05Merge remote-tracking branch 'yawning/bug14740'Nick Mathewson
2015-02-05Add a string representation for LD_SCHED, and a extra sanity check.Yawning Angel
This both fixes the problem, and ensures that forgetting to update domain_list in the future will trigger the bug codepath instead of a NULL pointer deref.
2015-02-05improve changes files moreNick Mathewson
2015-02-0514554 doesn't need a changes file: the bug wasn't in a releaseNick Mathewson
2015-02-04Bump the minimum relay version to 0.2.4.18-rcNick Mathewson
Closes #13555
2015-02-04Use getsockname, not getsockopt, on TPROXY socketsNick Mathewson
2015-02-03fix a unit tests memory leak (my fault)Nick Mathewson
2015-02-03Work around test_status.c weirdnessNick Mathewson
Ordinarily, get_options() can never return NULL, but with test_status.c mocking, it can. So test for that case. The best fix here would be to pass the options value to a bridge_server_mode() function.
2015-02-03Merge branch 'bug6852'Nick Mathewson
Conflicts: src/or/status.c
2015-02-03Choose a more deliberate cutoff for clients in heartbeatNick Mathewson
2015-02-02Merge remote-tracking branch 'public/bug9635_warnings_025'Nick Mathewson
Conflicts: src/test/test.c
2015-02-02tweak based on comments from dgouletNick Mathewson
2015-02-02Merge branch 'feature13865_test'Nick Mathewson
2015-02-02Test for 13865.rl1987
2015-02-02Add more parenthesis to the definition of ARRAY_LENGTHNick Mathewson
2015-02-02Fix an unused-variable warning.Nick Mathewson
2015-02-02Merge branch 'feature13864_squashed'Nick Mathewson
2015-02-02Updating manpage for 13865.rl1987
2015-02-02Changes file for 13865.rl1987
2015-02-02Allow reading torrc from stdin.rl1987
2015-02-02Merge remote-tracking branch 'public/bug13319'Nick Mathewson
2015-02-02Merge remote-tracking branch 'sysrqb/bug14216_bad_since'Nick Mathewson
2015-02-02Merge remote-tracking branch 'dgoulet/bug14202_026_v1'Nick Mathewson
2015-02-02Merge remote-tracking branch 'public/14188_part1'Nick Mathewson