torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,487 Commits 53 Branches 631 Tags
1acaba478e4d608ae592475fb3db1d7b0eb3a94e
Commit Graph
10746 Commits
Author SHA1 Message Date
Roger Dingledine eed0ac5109 bump to 0.2.3.20-rc 2012-08-05 01:39:14 -04:00
Nick Mathewson daeaa9ff04 Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.3 2012-08-03 13:34:20 -04:00
Nick Mathewson 93be3a8822 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 
Conflicts:
	src/or/routerlist.c
 2012-08-03 12:04:11 -04:00
Robert Ransom 308f6dad20 Mitigate a side-channel leak of which relays Tor chooses for a circuit 
Tor's and OpenSSL's current design guarantee that there are other leaks,
but this one is likely to be more easily exploitable, and is easy to fix.
 2012-08-03 11:49:51 -04:00
Robert Ransom 82c5e385cb Remove bogus comment claiming that an assertion is triggerable by consensus 2012-08-03 11:45:33 -04:00
Nick Mathewson 1040afb242 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2012-08-03 11:18:40 -04:00
Nick Mathewson 57e35ad3d9 Avoid possible segfault when handling networkstatus vote with bad flavor 
Fix for 6530; fix on 0.2.2.6-alpha.
 2012-08-03 10:53:00 -04:00
Nick Mathewson 62637fa224 Avoid hard (impossible?)-to-trigger double-free in dns_resolve() 
Fixes 6480; fix on 0.2.0.1-alpha; based on pseudonymous patch.
 2012-07-31 17:19:17 -04:00
Nick Mathewson aed93f8ad9 Merge branch 'bug6490_v2' into maint-0.2.3 2012-07-31 10:28:43 -04:00
Nick Mathewson 2bd45213c9 Warn when accounting is used in a way likely to link hidden services 
Fix for 6490.
 2012-07-31 10:28:16 -04:00
Roger Dingledine ab4c6b6543 bump to 0.2.3.19-rc-dev 2012-07-31 05:43:41 -04:00
Roger Dingledine aa985598f5 Merge branch 'maint-0.2.3' into release-0.2.3 2012-07-31 05:10:35 -04:00
Roger Dingledine 1004489354 trivial grammar fix 2012-07-31 05:10:05 -04:00
Nick Mathewson 692005b38d Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3 2012-07-23 12:35:23 -04:00
George Kadianakis a1d060a68f Better handling of server managed proxies when Tor is not a relay. 2012-07-18 20:01:02 +02:00
Nick Mathewson b355ddb20f Merge branch 'smartlist_shorten' into maint-0.2.3 2012-07-18 10:14:14 -04:00
Nick Mathewson 78dec94307 Tweaks to 6400 changes file and docs as suggested by arma 2012-07-18 10:12:19 -04:00
Nick Mathewson 4cac5df554 Improve message on spurious SOCKSListenAddress 2012-07-17 12:02:55 -04:00
Nick Mathewson efdf6c7118 Fix the remaining instances of nexted SMARTLIST_FOREACH 2012-07-17 10:41:24 -04:00
Nick Mathewson 7faf115dff Change all SMARTLIST_FOREACH loops of >=10 lines to use BEGIN/END 
The SMARTLIST_FOREACH macro is more convenient than BEGIN/END when
you have a nice short loop body, but using it for long bodies makes
your preprocessor tell the compiler that all the code is on the same
line.  That causes grief, since compiler warnings and debugger lines
will all refer to that one line.

So, here's a new style rule: SMARTLIST_FOREACH blocks need to be
short.
 2012-07-17 10:34:08 -04:00
Linus Nordberg 21c6c84853 Allow TestingTorNetwork when alternate dir and bridge authorities are set. 
Allow TestingTorNetwork when AlternateDirAuthority and
AlternateBridgeAuthority is set even if DirServer is not.
 2012-07-17 09:35:38 -04:00
Nick Mathewson 93b7301755 Refer to the correct variable in a loop when parsing entry guard state 
Fixes bug 6397 and coverity issue 709599. Bugfix on 0.2.3.17-beta.
 2012-07-16 11:49:45 -04:00
Nick Mathewson d32f5081e1 Coverity 709056: Check return value on fputs in tor-gencert 2012-07-16 11:38:39 -04:00
Roger Dingledine b26d59d715 Merge branch 'maint-0.2.3' into release-0.2.3 2012-07-06 16:32:32 -04:00
Roger Dingledine 5ddb9b3134 Merge branch 'maint-0.2.2' into maint-0.2.3 2012-07-06 16:31:40 -04:00
Roger Dingledine 4e7552e552 Revert to the May 2012 geoip db 
The June 2012 db marks too many relays as country "A1".
Addresses bug 6334.
 2012-07-06 16:29:51 -04:00
Roger Dingledine 513ae1941f bump to 0.2.3.19-rc 2012-07-06 09:01:18 -04:00
Roger Dingledine 27ec0248d2 Merge remote-tracking branch 'nickm/bug6271_part_a' into maint-0.2.3 2012-07-06 08:57:29 -04:00
George Kadianakis 62c1311b3a Fix port range in parse_port_range(). 2012-07-06 08:02:14 -04:00
Nick Mathewson 419f541aa7 Fix a bug handling SENDME cells on nonexistent streams. 
This could result in bizarre window values. Report and patch
contributed pseudymously.  Fixes part of bug 6271. This bug was
introduced before the first Tor release, in svn commit r152.

(bug 6271, part a.)
 2012-07-06 07:29:54 -04:00
Nick Mathewson e9b33ed1bf On windows, ENOBUFS starts with WSA. #6296. Fix on 0.2.18-rc 2012-07-05 05:01:00 -04:00
Roger Dingledine d13389b30e Revert "Detect bug 6252 (unexpected sendme cell)" 
This reverts commit c32ec9c425.

It turns out the two sides of the circuit don't actually stay in sync,
so it is perfectly normal for the circuit window on the exit relay to
grow to 2000+. We should fix that bug and then reconsider this patch.
 2012-07-01 17:36:35 -04:00
Roger Dingledine c32ec9c425 Detect bug 6252 (unexpected sendme cell) 
I only check on circuits, not streams, since bloating your stream
window past the initial circuit window can't help you much.

Also, I compare to CIRCWINDOW_START_MAX so we don't have surprising
races if we lower CIRCWINDOW_START for an experiment.
 2012-07-01 05:27:08 -04:00
Nick Mathewson 9c5a118272 bump version to 0.2.3.18-rc-dev 2012-06-28 16:01:55 -04:00
Roger Dingledine 64f8e68e65 bump to 0.2.3.18-rc 2012-06-28 15:34:33 -04:00
Roger Dingledine 81cd3d7ad6 add a blurb for 0.2.3.18-rc, other minor cleanups 2012-06-28 15:32:36 -04:00
Roger Dingledine dd7a27d17e fix grammar in comment 2012-06-28 13:43:01 -04:00
Nick Mathewson 217862b317 Merge remote-tracking branch 'public/bug6244_part2' into maint-0.2.3 2012-06-28 10:49:32 -04:00
Andrea Shepard bdc8270280 Downgrade 'Got a certificate, but we already have it' log message from warning to info, except when we're a dirauth (fixes bug 5238) 2012-06-28 10:42:43 -04:00
Nick Mathewson 28c42fe029 Fix GETINFO address-mappings/... with wildcarded addresses. 2012-06-27 23:55:01 -04:00
Nick Mathewson 23f2e37ff7 Allow wildcarded mapaddress targets in controller MAPADDRESS command 2012-06-27 23:38:04 -04:00
Nick Mathewson 6330d2d9e6 Merge remote-tracking branch 'public/bug6227' into maint-0.2.3 2012-06-26 11:03:56 -04:00
Nick Mathewson 5fad3dc36b Fix a warning when using glibc's strcspn with clang. 
With glibc 2.15 and clang 3.0, I get warnings from where we use the
strcpsn implementation in the header as strcspn(string, "=").  This
is apparently because clang sees that part of the strcspn macro
expands to "="[2], and doesn't realize that that part of the macro
is only evaluated when "="[1] != 0.
 2012-06-26 11:02:44 -04:00
Nick Mathewson 9c8ec0aa20 Add a unit test for environment_variable_names_equal 
I need this because I'm about to frob that function to stop using
strcspn() in order to get rid of a clang warning.
 2012-06-26 10:50:37 -04:00
Nick Mathewson 201b852c27 Fix a compilation warning with clang 3.0 
In b1ad1a1d02 we introduced an implicit (but safe)
long-to-int shortening that clang didn't like.

Warning not in any released version of Tor.
 2012-06-26 10:48:31 -04:00
Nick Mathewson c4586f4df7 Downgrade message about md cache cleaning from notice to info 
Fix for #6238
 2012-06-26 10:30:11 -04:00
Nick Mathewson 4645f28c3b Bump the test util/threads timeout up to 150 sec 
This should make some debian build systems happier.

Also, increase the select() timeout to a more reasonable 100 msec.
 2012-06-25 13:44:34 -04:00
George Kadianakis 53e4452f98 Don't do DNS lookups when parsing corrupted managed proxy messages. 
The functions parse_{s,c}method_line() were using
tor_addr_port_lookup() which is capable of doing DNS lookups. DNS
lookups should not be necessary when parsing {C,S}METHOD lines.
 2012-06-25 13:19:22 -04:00
Nick Mathewson 2703e072a1 Merge remote-tracking branch 'public/bug6225' into maint-0.2.3 2012-06-25 11:51:19 -04:00
Nick Mathewson a6688c574e Catch a few more K&R violations with make check-spaces 
We now catch bare {s that should be on the previous line with a do,
while, if, or for, and elses that should share a line with their
preceding }.

That is,
    if (foo)
    {
and
    if (foo) {
      ...
    }
    else

are now detected.

We should think about maybe making Tor uncrustify-clean some day,
but configuring uncrustify is an exercise in bizarreness, and
reformatting huge gobs of Tor is always painful.
 2012-06-23 15:54:01 -04:00