]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
12 years agoIf we write the annotation but not the microdescriptor, rewind.
Nick Mathewson [Thu, 13 Jun 2013 16:29:01 +0000 (12:29 -0400)] 
If we write the annotation but not the microdescriptor, rewind.

This fixes bug 9047 (and some parts of 9031, 8922, 8883 that weren't
fixed in 8822).  Bugfix on 0.2.2.6-alpha.

12 years agoMerge remote-tracking branch 'public/bug8822' into maint-0.2.4
Nick Mathewson [Thu, 13 Jun 2013 13:40:32 +0000 (09:40 -0400)] 
Merge remote-tracking branch 'public/bug8822' into maint-0.2.4

12 years agoFix the biggest errors in doc/HACKING
Nick Mathewson [Thu, 13 Jun 2013 01:27:30 +0000 (21:27 -0400)] 
Fix the biggest errors in doc/HACKING

We can wait for 0.2.5 for a full rewrite.  #8964

12 years agoRemove various outdated documents.
Nick Mathewson [Thu, 13 Jun 2013 01:07:27 +0000 (21:07 -0400)] 
Remove various outdated documents.

doc/TODO and doc/spec/README were placeholders to tell people where to
look for the real TODO and README stuff -- we replaced them years ago,
though.

authority-policy, v3-authority-howto, and torel-design.txt belong in
torspec.  I'm putting them in attic there since I think they may be in
large part obsolete, but someone can rescue them if they're not.

translations.txt is outdated, and refers to lots of programs other
than Tor.  We have much better translation resources on the website
now.

tor-win32-mingw-creation.txt is pending review of a revised version
for 0.2.5 (see ticket #4520), but there's no reason to ship this one
while we're waiting for an accurate version.

the tor-rpm-creation.txt isn't obsolete AFAIK, but it belongs in
doc/contrib if anywhere.

Resolves bug #8965.

12 years agoMerge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4
Nick Mathewson [Thu, 13 Jun 2013 00:55:35 +0000 (20:55 -0400)] 
Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4

12 years agoMake all consumers of microdesc_t.body tolerate NULL
Nick Mathewson [Wed, 12 Jun 2013 16:12:11 +0000 (12:12 -0400)] 
Make all consumers of microdesc_t.body tolerate NULL

This is another fix to try to mitigate recurrences of 8031/8822.

12 years agoUnmap the microdescriptor cache before replacing it.
Nick Mathewson [Wed, 12 Jun 2013 16:04:33 +0000 (12:04 -0400)] 
Unmap the microdescriptor cache before replacing it.

This is a reprise of the fix in bdff7e3299d786905c1f6 reintroduced
that bug.  Briefly: windows doesn't seem to like deleting a mapped
file.  I tried adding the PROT_SHARED_DELETE flag to the createfile
all, but that didn't actually fix this issue.  Fortunately, the unit
test I added in 4f4fc63fea0589a4fa03f3859dc27860cdde75af should
prevent us from making this particular screw-up again.

This patch also tries to limit the crash potential of a failure to
write by a little bit, although it could do a better job of retaining
microdescriptor bodies.

Fix for bug 8822, bugfix on 0.2.4.12-alpha.

12 years agoRevert "Use the FILE_SHARE_DELETE flag for CreateFile on a mapping"
Nick Mathewson [Wed, 12 Jun 2013 14:45:48 +0000 (10:45 -0400)] 
Revert "Use the FILE_SHARE_DELETE flag for CreateFile on a mapping"

This reverts commit 884a0e269c382f9e927d8c8b1ef4ef9d2d48379d.

I'm reverting this because it doesn't actually make the problem go
away.  It appears that instead we need to do unmap-then-replace.

12 years agoMerge remote-tracking branch 'public/bug2077_share_delete' into maint-0.2.4
Nick Mathewson [Wed, 12 Jun 2013 14:00:33 +0000 (10:00 -0400)] 
Merge remote-tracking branch 'public/bug2077_share_delete' into maint-0.2.4

12 years agoUse the FILE_SHARE_DELETE flag for CreateFile on a mapping
Nick Mathewson [Wed, 12 Jun 2013 13:53:46 +0000 (09:53 -0400)] 
Use the FILE_SHARE_DELETE flag for CreateFile on a mapping

A comment by rransom on #8795 taken together with a comment by doorss
recorded on #2077 suggest that *every* attempt to replace the md cache
will fail on Vista/Win7 if we don't have the FILE_SHARE_DELETE flag
passed to CreateFile, and if we try to replace the file ourselves
before unmapping it.  I'm adding the FILE_SHARE_DELETE, since that's
this simplest fix.  Broken indexers (the favored #2077 hypothesis)
could still cause trouble here, but at least this patch should make us
stop stepping on our own feet.

Likely fix for #2077 and its numerous duplicates. Bugfix on
0.2.2.6-alpha, which first had a microdescriptor cache that would get
replaced before remapping it.

12 years agoExpand microdesc cache tests
Nick Mathewson [Wed, 12 Jun 2013 13:30:09 +0000 (09:30 -0400)] 
Expand microdesc cache tests

Is it possible that *every* attempt to replace the microdesc cache on
windows 7 is going to fail because of our lack of FILE_SHARE_DELETE
while opening the file?  If so, this test will catch #2077 and let us
know when it's fixed.

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Mon, 10 Jun 2013 16:26:39 +0000 (12:26 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

12 years agoMerge branch 'bug9017' into maint-0.2.3
Nick Mathewson [Mon, 10 Jun 2013 16:25:14 +0000 (12:25 -0400)] 
Merge branch 'bug9017' into maint-0.2.3

12 years agoFix (Open?)BSD fast-connect bug with optimistic data.
Nick Mathewson [Mon, 10 Jun 2013 16:14:49 +0000 (12:14 -0400)] 
Fix (Open?)BSD fast-connect bug with optimistic data.

There's an assertion failure that can occur if a connection has
optimistic data waiting, and then the connect() call returns 0 on the
first attempt (rather than -1 and EINPROGRESS).  That latter behavior
from connect() appears to be an (Open?)BSDism when dealing with remote
addresses in some cases. (At least, I've only seen it reported with
the BSDs under libevent, even when the address was 127.0.0.1.  And
we've only seen this problem in Tor with OpenBSD.)

Fixes bug 9017; bugfix on 0.2.3.1-alpha, which first introduced
optimistic data. (Although you could also argue that the commented-out
connection_start_writing in 155c9b80 back in 2002 is the real source
of the issue.)

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Wed, 5 Jun 2013 15:22:19 +0000 (11:22 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

12 years agoMerge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
Nick Mathewson [Wed, 5 Jun 2013 15:22:02 +0000 (11:22 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

12 years agoFix two cut'n'paste docu bugs.
Linus Nordberg [Wed, 5 Jun 2013 13:48:57 +0000 (15:48 +0200)] 
Fix two cut'n'paste docu bugs.

12 years agoUpdate to the June 2013 GeoIP database.
Karsten Loesing [Wed, 5 Jun 2013 06:43:03 +0000 (08:43 +0200)] 
Update to the June 2013 GeoIP database.

12 years agoWhen launching a resolve request on behalf of an AF_UNIX control, omit the address...
Andrea Shepard [Fri, 31 May 2013 22:35:51 +0000 (15:35 -0700)] 
When launching a resolve request on behalf of an AF_UNIX control, omit the address field of the new entry connection.  Fixes bug 8639.

12 years agoDowngrade the unexpected sendme cell warnings for 0.2.4
Nick Mathewson [Tue, 21 May 2013 17:45:21 +0000 (13:45 -0400)] 
Downgrade the unexpected sendme cell warnings for 0.2.4

See discussion on #8093

12 years agoCopy-paste description of PathBias params from man page to or.h comment
Andrea Shepard [Mon, 20 May 2013 19:46:00 +0000 (12:46 -0700)] 
Copy-paste description of PathBias params from man page to or.h comment

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Mon, 20 May 2013 16:37:21 +0000 (12:37 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

12 years agoMerge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
Nick Mathewson [Mon, 20 May 2013 16:34:59 +0000 (12:34 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

12 years agoFix bug 8846: better log message on IP version confusion
Nick Mathewson [Fri, 17 May 2013 18:50:45 +0000 (14:50 -0400)] 
Fix bug 8846: better log message on IP version confusion

12 years agoFix unit tests to pass after fix for #8879
Nick Mathewson [Wed, 15 May 2013 18:34:59 +0000 (14:34 -0400)] 
Fix unit tests to pass after fix for #8879

12 years agoFix socks5 handshake for username/password auth
Roger Dingledine [Wed, 15 May 2013 07:34:37 +0000 (03:34 -0400)] 
Fix socks5 handshake for username/password auth

The fix for bug 8117 exposed this bug, and it turns out real-world
applications like Pidgin do care. Bugfix on 0.2.3.2-alpha; fixes bug 8879.

12 years agoUpdate to the May 2013 GeoIP database.
Karsten Loesing [Mon, 13 May 2013 13:37:43 +0000 (15:37 +0200)] 
Update to the May 2013 GeoIP database.

12 years agoMerge bug5595-v2-squashed into maint-0.2.4
Andrea Shepard [Sat, 11 May 2013 02:39:48 +0000 (19:39 -0700)] 
Merge bug5595-v2-squashed into maint-0.2.4

12 years agoAdd some unit tests for fp_pair_map_t to test/containers.c based on the strmap tests
Andrea Shepard [Thu, 9 May 2013 17:51:48 +0000 (10:51 -0700)] 
Add some unit tests for fp_pair_map_t to test/containers.c based on the strmap tests

12 years agoRephrase comment in trusted_dirs_load_certs_from_string() to reflect 5595 fix
Andrea Shepard [Thu, 9 May 2013 16:41:50 +0000 (09:41 -0700)] 
Rephrase comment in trusted_dirs_load_certs_from_string() to reflect 5595 fix

12 years agoMake warning in authority_cert_dl_failed() LD_BUG per NickM code review
Andrea Shepard [Thu, 9 May 2013 16:33:32 +0000 (09:33 -0700)] 
Make warning in authority_cert_dl_failed() LD_BUG per NickM code review

12 years agoUse tor_asprintf() and clean up string handling in authority_certs_fetch_missing()
Andrea Shepard [Thu, 9 May 2013 16:31:39 +0000 (09:31 -0700)] 
Use tor_asprintf() and clean up string handling in authority_certs_fetch_missing()

12 years agoClean up ugly constants in connection_dir_download_cert_failed(), and fix a broken one
Andrea Shepard [Thu, 9 May 2013 15:23:53 +0000 (08:23 -0700)] 
Clean up ugly constants in connection_dir_download_cert_failed(), and fix a broken one

12 years agoAvoid duplicate downloads by (fp,sk) and by fp for authority certs when bootstrapping
Andrea Shepard [Thu, 9 May 2013 15:19:48 +0000 (08:19 -0700)] 
Avoid duplicate downloads by (fp,sk) and by fp for authority certs when bootstrapping

12 years agoWhen downloading certificates, distinguish requesting by identity digest from request...
Andrea Shepard [Thu, 9 May 2013 11:56:54 +0000 (04:56 -0700)] 
When downloading certificates, distinguish requesting by identity digest from requesting by ID digest, signing key pair; fixes bug 5595

12 years agoImplement fp_pair_map_t
Andrea Shepard [Fri, 22 Mar 2013 19:13:25 +0000 (12:13 -0700)] 
Implement fp_pair_map_t

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Thu, 9 May 2013 17:14:53 +0000 (13:14 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

12 years agoMerge branch 'bug8844_v2' into maint-0.2.3
Nick Mathewson [Thu, 9 May 2013 17:14:22 +0000 (13:14 -0400)] 
Merge branch 'bug8844_v2' into maint-0.2.3

12 years agoDon't run off the end of the array-of-freelists
Nick Mathewson [Wed, 8 May 2013 16:04:18 +0000 (12:04 -0400)] 
Don't run off the end of the array-of-freelists

This is a fix for bug 8844, where eugenis correctly notes that there's
a sentinel value at the end of the list-of-freelists that's never
actually checked.  It's a bug since the first version of the chunked
buffer code back in 0.2.0.16-alpha.

This would probably be a crash bug if it ever happens, but nobody's
ever reported something like this, so I'm unsure whether it can occur.
It would require write_to_buf, write_to_buf_zlib, read_to_buf, or
read_to_buf_tls to get an input size of more than 32K.  Still, it's a
good idea to fix this kind of thing!

12 years agoFix bug 8845: check the right length of memory in aes unit tests
Nick Mathewson [Wed, 8 May 2013 16:59:08 +0000 (12:59 -0400)] 
Fix bug 8845: check the right length of memory in aes unit tests

This couldn't actually be a buffer overrun unless AES somehow turned
into memcpy, but still it's good to fix it.

12 years agoUse a clearer idiom for node identity in router_counts_toward_thresholds
Nick Mathewson [Sun, 5 May 2013 22:55:19 +0000 (18:55 -0400)] 
Use a clearer idiom for node identity in router_counts_toward_thresholds

12 years agoFix 8833: crash bug from using NULL node->ri in dirserv.c
Nick Mathewson [Sun, 5 May 2013 22:52:53 +0000 (18:52 -0400)] 
Fix 8833: crash bug from using NULL node->ri in dirserv.c

It appears that moria1 crashed because of one instance of this (the
one in router_counts_toward_thresholds).  The other instance I fixed
won't actually have broken anything, but I think it's more clear this
way.

Fixes bug 8833; bugfix on 0.2.4.12-alpha.

12 years agoMerge remote-tracking branch 'public/bug6026' into maint-0.2.4
Nick Mathewson [Thu, 25 Apr 2013 02:15:47 +0000 (22:15 -0400)] 
Merge remote-tracking branch 'public/bug6026' into maint-0.2.4

12 years agoMerge branch 'bug8235-fix-rebased' into maint-0.2.4
Nick Mathewson [Thu, 25 Apr 2013 02:04:15 +0000 (22:04 -0400)] 
Merge branch 'bug8235-fix-rebased' into maint-0.2.4

12 years agoIncrease the pathbias state file miscounting version check.
Mike Perry [Wed, 24 Apr 2013 00:53:53 +0000 (17:53 -0700)] 
Increase the pathbias state file miscounting version check.

We now know the bug is present in 0.2.4.12-alpha too. It should be fixed in
0.2.4.13-alpha, though.

12 years agoChanges file for 8235.
Mike Perry [Tue, 23 Apr 2013 21:44:40 +0000 (14:44 -0700)] 
Changes file for 8235.

12 years agoBug 8235: Fix scaling adjustments.
Mike Perry [Tue, 23 Apr 2013 21:43:38 +0000 (14:43 -0700)] 
Bug 8235: Fix scaling adjustments.

We need to subtract both the current built circuits *and* the attempted
circuits from the attempt count during scaling, since *both* have already been
counted there.

12 years agoAdd a boolean to flag-thresholds for "we have enough measured bandwidth"
Nick Mathewson [Fri, 19 Apr 2013 02:43:52 +0000 (22:43 -0400)] 
Add a boolean to flag-thresholds for "we have enough measured bandwidth"

Implements #8711.

12 years agoMerge remote-tracking branch 'public/bug8716_023' into maint-0.2.4
Nick Mathewson [Fri, 19 Apr 2013 01:33:53 +0000 (21:33 -0400)] 
Merge remote-tracking branch 'public/bug8716_023' into maint-0.2.4

12 years agoMerge remote-tracking branch 'public/bug8719' into maint-0.2.4
Nick Mathewson [Thu, 18 Apr 2013 15:26:54 +0000 (11:26 -0400)] 
Merge remote-tracking branch 'public/bug8719' into maint-0.2.4

12 years agoRemove a double-newline
Nick Mathewson [Thu, 18 Apr 2013 15:14:05 +0000 (11:14 -0400)] 
Remove a double-newline

12 years agoMerge branch 'less_charbuf_rebased' into maint-0.2.4
Nick Mathewson [Thu, 18 Apr 2013 15:13:36 +0000 (11:13 -0400)] 
Merge branch 'less_charbuf_rebased' into maint-0.2.4

Conflicts:
src/or/dirserv.c
src/or/dirserv.h
src/test/test_dir.c

12 years agoAdd unit test for encoding ntor key in routerinfo
Nick Mathewson [Tue, 2 Apr 2013 18:54:54 +0000 (14:54 -0400)] 
Add unit test for encoding ntor key in routerinfo

12 years agoRemove the unused pk3 variable from test_dir_formats
Nick Mathewson [Tue, 2 Apr 2013 18:54:32 +0000 (14:54 -0400)] 
Remove the unused pk3 variable from test_dir_formats

12 years agoRe-enable test for parsing and generating descriptor with exit policy
Nick Mathewson [Tue, 2 Apr 2013 18:45:13 +0000 (14:45 -0400)] 
Re-enable test for parsing and generating descriptor with exit policy

Looks like I turned this off in 6ac42f5e back in 2003 and never got
around to making it work again.  There has been no small amount of
code drift.

12 years agoTest networkstatus_getinfo_helper_single
Nick Mathewson [Tue, 2 Apr 2013 17:59:53 +0000 (13:59 -0400)] 
Test networkstatus_getinfo_helper_single

12 years agoAdd a quick-and-dirty-test for generate_v2_networkstatus.
Nick Mathewson [Tue, 2 Apr 2013 16:45:12 +0000 (12:45 -0400)] 
Add a quick-and-dirty-test for generate_v2_networkstatus.

It sure is a good thing we can run each test in its own process, or
else the amount of setup I needed to do to make this thing work
would have broken all the other tests.

Test mocking would have made this easier to write too.

12 years agoRemove the now-unused router_get_networkstatus_v3_hash
Nick Mathewson [Tue, 2 Apr 2013 15:58:29 +0000 (11:58 -0400)] 
Remove the now-unused router_get_networkstatus_v3_hash

12 years agoTest improvement: include microdesc lines in our synthetic microdesc consensuses.
Nick Mathewson [Tue, 2 Apr 2013 15:49:30 +0000 (11:49 -0400)] 
Test improvement: include microdesc lines in our synthetic microdesc consensuses.

12 years agoFix a couple of documentation issues.
Nick Mathewson [Mon, 18 Mar 2013 19:00:52 +0000 (15:00 -0400)] 
Fix a couple of documentation issues.

12 years agoRemove some now-needless length defines
Nick Mathewson [Sun, 24 Feb 2013 03:37:39 +0000 (22:37 -0500)] 
Remove some now-needless length defines

12 years agoRemove RS_ENTRY_LEN
Nick Mathewson [Sat, 23 Feb 2013 07:46:40 +0000 (02:46 -0500)] 
Remove RS_ENTRY_LEN

Nothing uses it any longer now that we use smartlists of strings for
stuff that manipulates iles of formatted routerstatuses.

12 years agoInitial changelog for less_charbuf
Nick Mathewson [Fri, 22 Feb 2013 17:56:25 +0000 (12:56 -0500)] 
Initial changelog for less_charbuf

12 years agoRefactor dirobj signature generation
Nick Mathewson [Fri, 22 Feb 2013 17:53:45 +0000 (12:53 -0500)] 
Refactor dirobj signature generation

Now we can compute the hash and signature of a dirobj before
concatenating the smartlist, and we don't need to play silly games
with sigbuf and realloc any more.

12 years agoUse chunks, not buffers, for router descriptors
Nick Mathewson [Fri, 22 Feb 2013 17:17:23 +0000 (12:17 -0500)] 
Use chunks, not buffers, for router descriptors

12 years agoRefactor v2 networkstatus generation to avoid buffer-style
Nick Mathewson [Wed, 20 Feb 2013 06:05:51 +0000 (01:05 -0500)] 
Refactor v2 networkstatus generation to avoid buffer-style

12 years agoRefactor routerstatus_format_entry to avoid character-buffers
Nick Mathewson [Wed, 20 Feb 2013 05:55:34 +0000 (00:55 -0500)] 
Refactor routerstatus_format_entry to avoid character-buffers

12 years agoFix some wide lines
Nick Mathewson [Thu, 18 Apr 2013 14:30:14 +0000 (10:30 -0400)] 
Fix some wide lines

12 years agoDon't leak a waiting-for-certs consensus when accepting it.
Nick Mathewson [Wed, 17 Apr 2013 15:53:52 +0000 (11:53 -0400)] 
Don't leak a waiting-for-certs consensus when accepting it.

I believe this was introduced in 6bc071f765d2829249db52, which makes
this a fix on 0.2.0.10-alpha.  But my code archeology has not extended
to actually testing that theory.

12 years agoFix memory leak when sending configuration-changed event
Nick Mathewson [Wed, 17 Apr 2013 15:34:15 +0000 (11:34 -0400)] 
Fix memory leak when sending configuration-changed event

Fix for bug #8718; bugfix on 0.2.3.3-alpha.

12 years agoMerge remote-tracking branch 'public/bug7143_v2' into maint-0.2.4
Nick Mathewson [Wed, 17 Apr 2013 14:49:59 +0000 (10:49 -0400)] 
Merge remote-tracking branch 'public/bug7143_v2' into maint-0.2.4

12 years agoMerge branch 'bug8037_squashed' into maint-0.2.4
Nick Mathewson [Wed, 17 Apr 2013 14:45:45 +0000 (10:45 -0400)] 
Merge branch 'bug8037_squashed' into maint-0.2.4

12 years agoReject most directory documents with an internal NUL.
Nick Mathewson [Fri, 15 Mar 2013 17:49:04 +0000 (13:49 -0400)] 
Reject most directory documents with an internal NUL.

(Specifically, we reject all the ones that aren't NUL-terminated,
since a NUL-terminated thing can't have a NUL in the middle.)

Another fix for #8037.

12 years agoMerge branch 'bug8683_rebased' into maint-0.2.4
Nick Mathewson [Mon, 15 Apr 2013 01:48:44 +0000 (21:48 -0400)] 
Merge branch 'bug8683_rebased' into maint-0.2.4

12 years agoRemove a now-empty if body; invert the sense of its condition
Nick Mathewson [Thu, 11 Apr 2013 19:11:46 +0000 (15:11 -0400)] 
Remove a now-empty if body; invert the sense of its condition

12 years agoRemvoe total_bandwidth and total_exit_bandwidth as unused.
Nick Mathewson [Thu, 11 Apr 2013 19:10:35 +0000 (15:10 -0400)] 
Remvoe total_bandwidth and total_exit_bandwidth as unused.

12 years agoRename all fields which measure bw in kb to end with _kb
Nick Mathewson [Thu, 11 Apr 2013 15:43:40 +0000 (11:43 -0400)] 
Rename all fields which measure bw in kb to end with _kb

12 years agoFix some KB/B confusion in flag threshold minima.
Nick Mathewson [Thu, 11 Apr 2013 14:36:53 +0000 (10:36 -0400)] 
Fix some KB/B confusion in flag threshold minima.

12 years agoManpage: refer to ExcludeExitNodes, not the nonexistent ExcludeEntryNodes
Nick Mathewson [Sat, 13 Apr 2013 22:27:08 +0000 (18:27 -0400)] 
Manpage: refer to ExcludeExitNodes, not the nonexistent ExcludeEntryNodes

Spotted on tor-talk by "hamahangi".

12 years agoMerge remote-tracking branch 'public/bug5650_squashed' into maint-0.2.4
Nick Mathewson [Fri, 12 Apr 2013 05:13:22 +0000 (01:13 -0400)] 
Merge remote-tracking branch 'public/bug5650_squashed' into maint-0.2.4

12 years agoAvoid busy-looping on WANTREAD within connection_handle_write
Nick Mathewson [Wed, 10 Apr 2013 23:30:41 +0000 (19:30 -0400)] 
Avoid busy-looping on WANTREAD within connection_handle_write

Fix for bug 5650.  Also, if we get a WANTREAD while reading while
writing, make sure we're reading.

12 years agoMerge branch 'bug8587_v3' into maint-0.2.4
Nick Mathewson [Thu, 11 Apr 2013 22:12:44 +0000 (18:12 -0400)] 
Merge branch 'bug8587_v3' into maint-0.2.4

12 years agoBetter test program for 128-bit math support
Nick Mathewson [Thu, 11 Apr 2013 21:52:26 +0000 (17:52 -0400)] 
Better test program for 128-bit math support

Clang 3.2 does constant-folding and variable substitution to determine
that the program is equivalent to "return 1".  Splitting the 128-bit
math into a new function seems sufficient to fix this.

12 years agosocks5 will ask for username/password if we offer it
Roger Dingledine [Thu, 11 Apr 2013 06:53:26 +0000 (02:53 -0400)] 
socks5 will ask for username/password if we offer it

Commit a264c4fe made the socks5 server prefer auth 2 if it's offered,
but it didn't update the unit test to expect it.

12 years agoUse credible_bandwidth uniformly in setting/using fast_bandwidth
Nick Mathewson [Thu, 11 Apr 2013 14:26:31 +0000 (10:26 -0400)] 
Use credible_bandwidth uniformly in setting/using fast_bandwidth

We were using credible_bandwidth to build the fast_bandwidth
threshold, but comparing it to bandwidth_for_router.

12 years agoUse correct units for dirserv_get_{credible_bandwidth,bandwidth_for_router}
Nick Mathewson [Thu, 11 Apr 2013 14:24:11 +0000 (10:24 -0400)] 
Use correct units for dirserv_get_{credible_bandwidth,bandwidth_for_router}

We were mixing bandwidth file entries (which are in kilobytes) with
router_get_advertised_bw() entries, which were in bytes.

Also, use router_get_advertised_bandwidth_capped() for credible_bandwidth.

12 years agoMerge remote-tracking branch 'public/bug8185_diagnostic' into maint-0.2.4
Nick Mathewson [Thu, 11 Apr 2013 05:46:28 +0000 (01:46 -0400)] 
Merge remote-tracking branch 'public/bug8185_diagnostic' into maint-0.2.4

12 years agoMerge remote-tracking branch 'public/bug7302' into maint-0.2.4
Nick Mathewson [Thu, 11 Apr 2013 05:42:54 +0000 (01:42 -0400)] 
Merge remote-tracking branch 'public/bug7302' into maint-0.2.4

Conflicts:
src/or/status.c

12 years agoMerge remote-tracking branch 'public/bug8117_023' into maint-0.2.4
Nick Mathewson [Thu, 11 Apr 2013 05:39:26 +0000 (01:39 -0400)] 
Merge remote-tracking branch 'public/bug8117_023' into maint-0.2.4

Conflicts:
doc/tor.1.txt
src/or/config.c
src/or/connection.c

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Mon, 8 Apr 2013 15:09:50 +0000 (11:09 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

12 years agoMerge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
Nick Mathewson [Mon, 8 Apr 2013 15:09:26 +0000 (11:09 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

12 years agoUpdate to the April 2013 GeoIP database.
Karsten Loesing [Mon, 8 Apr 2013 10:18:00 +0000 (12:18 +0200)] 
Update to the April 2013 GeoIP database.

12 years agoMerge remote-tracking branch 'desoxy/bug-8596' into maint-0.2.4
Nick Mathewson [Fri, 5 Apr 2013 20:57:53 +0000 (16:57 -0400)] 
Merge remote-tracking branch 'desoxy/bug-8596' into maint-0.2.4

12 years agotest.c: Try to create a more random temporary directory for our workspace (re: Bug...
Peter Palfrader [Thu, 4 Apr 2013 16:05:14 +0000 (18:05 +0200)] 
test.c: Try to create a more random temporary directory for our workspace (re: Bug#8638)

12 years agoController: Add CACHED keyword to ADDRMAP events (#8596 part 2/2)
Desoxy [Wed, 3 Apr 2013 16:50:51 +0000 (18:50 +0200)] 
Controller: Add CACHED keyword to ADDRMAP events (#8596 part 2/2)

Add keyword CACHED="YES"/"NO" to ADDRMAP control events to indicate whether the
DNS response will be cached or not.

12 years agoController: Always send ADDRMAP event after RESOLVE command (#8596 part 1/2)
Desoxy [Wed, 3 Apr 2013 16:50:27 +0000 (18:50 +0200)] 
Controller: Always send ADDRMAP event after RESOLVE command (#8596 part 1/2)

Since 7536c40 only DNS results for real SOCKS requests are added to the cache,
but not DNS results for DNSPort queries or control connection RESOLVE queries.
Only cache additions would trigger ADDRMAP events on successful resolve.

Change it so that DNS results received after a RESOLVE command also generate
ADDRMAP events.

12 years agoFix a wide line
Nick Mathewson [Wed, 3 Apr 2013 13:36:37 +0000 (09:36 -0400)] 
Fix a wide line

12 years agoMerge remote-tracking branch 'public/bug8235-diagnostic-rebased' into maint-0.2.4
Nick Mathewson [Wed, 3 Apr 2013 13:35:57 +0000 (09:35 -0400)] 
Merge remote-tracking branch 'public/bug8235-diagnostic-rebased' into maint-0.2.4

12 years agoChanges file.
Mike Perry [Mon, 25 Mar 2013 23:06:26 +0000 (16:06 -0700)] 
Changes file.

12 years agoAdd additional checks for Path Bias scaling.
Mike Perry [Mon, 25 Mar 2013 23:05:42 +0000 (16:05 -0700)] 
Add additional checks for Path Bias scaling.

Just in case more issues remain with scaling, it would be nice to pin-point
them as such.