]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
11 years agoRestore functionality for CookieAuthFileGroupReadable.
Nick Mathewson [Fri, 15 Aug 2014 12:30:44 +0000 (08:30 -0400)] 
Restore functionality for CookieAuthFileGroupReadable.

When we merged the cookieauthfile creation logic in 33c3e60a37, we
accidentally took out this feature.  Fixes bug 12864, bugfix on
0.2.5.1-alpha.

Also adds an ExtORPortCookieAuthFileGroupReadable, since there's no
reason not to.

11 years agoMerge remote-tracking branch 'public/bug12848_024' into maint-0.2.5
Nick Mathewson [Thu, 14 Aug 2014 03:14:28 +0000 (23:14 -0400)] 
Merge remote-tracking branch 'public/bug12848_024' into maint-0.2.5

Conflicts:
src/or/circuitbuild.c

11 years agoApply an MSVC compilation fix from Gisle Vanem
Nick Mathewson [Wed, 13 Aug 2014 19:11:00 +0000 (15:11 -0400)] 
Apply an MSVC compilation fix from Gisle Vanem

This fixes a double-define introduced in 28538069b2f1909a7600ec6d

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 13 Aug 2014 16:52:40 +0000 (12:52 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

11 years agoMerge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4
Nick Mathewson [Wed, 13 Aug 2014 16:51:38 +0000 (12:51 -0400)] 
Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Wed, 13 Aug 2014 16:51:27 +0000 (12:51 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

11 years agoUpdate geoip6 to the August 7 2014 database.
Karsten Loesing [Wed, 13 Aug 2014 14:16:11 +0000 (16:16 +0200)] 
Update geoip6 to the August 7 2014 database.

11 years agoUpdate geoip to the August 7 2014 database.
Karsten Loesing [Wed, 13 Aug 2014 14:08:33 +0000 (16:08 +0200)] 
Update geoip to the August 7 2014 database.

11 years agoFix another case of 12848 in circuit_handle_first_hop
Nick Mathewson [Tue, 12 Aug 2014 16:15:09 +0000 (12:15 -0400)] 
Fix another case of 12848 in circuit_handle_first_hop

I looked for other places where we set circ->n_chan early, and found
one in circuit_handle_first_hop() right before it calls
circuit_send_next_onion_skin(). If onion_skin_create() fails there,
then n_chan will still be set when circuit_send_next_onion_skin()
returns. We should probably fix that too.

11 years agoAdd an extra check in channel_send_destroy for circID==0
Nick Mathewson [Tue, 12 Aug 2014 16:14:05 +0000 (12:14 -0400)] 
Add an extra check in channel_send_destroy for circID==0

Prevents other cases of 12848.

11 years agoDon't send DESTROY to circID 0 when circuit_deliver_create_cell fails
Nick Mathewson [Tue, 12 Aug 2014 16:10:57 +0000 (12:10 -0400)] 
Don't send DESTROY to circID 0 when circuit_deliver_create_cell fails

Cypherpunks found this and wrote this patch.

Fix for 12848; fix on (I think) d58d4c0d, which went into 0.0.8pre1

11 years agoFix some URLs in the README
Nick Mathewson [Sat, 9 Aug 2014 19:57:06 +0000 (15:57 -0400)] 
Fix some URLs in the README

patch from mttp; fixes 12830

11 years agofix extra words in man page
Roger Dingledine [Sat, 9 Aug 2014 19:40:40 +0000 (15:40 -0400)] 
fix extra words in man page

11 years agoBuild circuits more readily when DisableNetwork goes to 0
Roger Dingledine [Tue, 5 Aug 2014 20:54:46 +0000 (16:54 -0400)] 
Build circuits more readily when DisableNetwork goes to 0

When Tor starts with DisabledNetwork set, it would correctly
conclude that it shouldn't try making circuits, but it would
mistakenly cache this conclusion and continue believing it even
when DisableNetwork is set to 0. Fixes the bug introduced by the
fix for bug 11200; bugfix on 0.2.5.4-alpha.

11 years agofix three typos in comments
Roger Dingledine [Wed, 6 Aug 2014 06:20:51 +0000 (02:20 -0400)] 
fix three typos in comments

11 years agoMerge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint...
Nick Mathewson [Wed, 30 Jul 2014 18:00:21 +0000 (14:00 -0400)] 
Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5

Conflicts:
contrib/dist/tor.service.in

11 years agoMerge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint...
Nick Mathewson [Wed, 30 Jul 2014 17:59:39 +0000 (13:59 -0400)] 
Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5

11 years agoVerify configuration file via ExecStartPre in the systemd unit file (#12730).
intrigeri [Tue, 29 Jul 2014 12:13:01 +0000 (12:13 +0000)] 
Verify configuration file via ExecStartPre in the systemd unit file (#12730).

11 years agoExplicitly disable RunAsDaemon in the systemd unit file (#12731).
intrigeri [Tue, 29 Jul 2014 12:23:04 +0000 (12:23 +0000)] 
Explicitly disable RunAsDaemon in the systemd unit file (#12731).

Our current systemd unit uses "Type = simple", so systemd does not expect tor to
fork. If the user has "RunAsDaemon 1" in their torrc, then things won't work as
expected. This is e.g. the case on Debian (and derivatives), since there we pass
"--defaults-torrc /usr/share/tor/tor-service-defaults-torrc" (that contains
"RunAsDaemon 1") by default.

The only solution I could find is to explicitly pass "--RunAsDaemon 0" when
starting tor from the systemd unit file, which this commit does.

11 years agobump to 0.2.5.6-alpha
Roger Dingledine [Mon, 28 Jul 2014 08:13:18 +0000 (04:13 -0400)] 
bump to 0.2.5.6-alpha

11 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Roger Dingledine [Mon, 28 Jul 2014 08:09:37 +0000 (04:09 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

11 years agobump to 0.2.4.23
Roger Dingledine [Mon, 28 Jul 2014 08:07:36 +0000 (04:07 -0400)] 
bump to 0.2.4.23

11 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Roger Dingledine [Mon, 28 Jul 2014 06:47:15 +0000 (02:47 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

11 years agoWarn and drop the circuit if we receive an inbound 'relay early' cell
Roger Dingledine [Mon, 28 Jul 2014 06:44:05 +0000 (02:44 -0400)] 
Warn and drop the circuit if we receive an inbound 'relay early' cell

Those used to be normal to receive on hidden service circuits due to bug
1038, but the buggy Tor versions are long gone from the network so we
can afford to resume watching for them. Resolves the rest of bug 1038;
bugfix on 0.2.1.19.

11 years agoadd a changes file for bug 12718
Roger Dingledine [Sun, 27 Jul 2014 19:41:30 +0000 (15:41 -0400)] 
add a changes file for bug 12718

11 years agoConfusing log message when circuit can't be extended
Arlo Breault [Sun, 27 Jul 2014 16:05:01 +0000 (18:05 +0200)] 
Confusing log message when circuit can't be extended

11 years agoget rid of already-merged prop221 changes file
Roger Dingledine [Fri, 25 Jul 2014 16:22:05 +0000 (12:22 -0400)] 
get rid of already-merged prop221 changes file

11 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Roger Dingledine [Fri, 25 Jul 2014 16:15:47 +0000 (12:15 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

Conflicts:
src/or/or.h

11 years agocircuit_build_failed: distinguish "first hop chan failed", "CREATE failed"
Nick Mathewson [Thu, 31 Oct 2013 20:53:31 +0000 (16:53 -0400)] 
circuit_build_failed: distinguish "first hop chan failed", "CREATE failed"

Roger spotted this on tor-dev in his comments on proposal 221.

(Actually, detect DESTROY vs everything else, since arma likes
network timeout indicating failure but not overload indicating failure.)

11 years agoImplement proposal 221: Stop sending CREATE_FAST
Nick Mathewson [Thu, 31 Oct 2013 20:44:14 +0000 (16:44 -0400)] 
Implement proposal 221: Stop sending CREATE_FAST

This makes FastFirstHopPK an AUTOBOOL; makes the default "auto"; and
makes the behavior of "auto" be "look at the consensus."

11 years agoget rid of already-merged bug12227 changes file
Roger Dingledine [Thu, 24 Jul 2014 23:49:01 +0000 (19:49 -0400)] 
get rid of already-merged bug12227 changes file

11 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Roger Dingledine [Thu, 24 Jul 2014 23:48:37 +0000 (19:48 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

11 years agoAvoid illegal read off end of an array in prune_v2_cipher_list
Nick Mathewson [Tue, 10 Jun 2014 15:11:47 +0000 (11:11 -0400)] 
Avoid illegal read off end of an array in prune_v2_cipher_list

This function is supposed to construct a list of all the ciphers in
the "v2 link protocol cipher list" that are supported by Tor's
openssl.  It does this by invoking ssl23_get_cipher_by_char on each
two-byte ciphersuite ID to see which ones give a match.  But when
ssl23_get_cipher_by_char cannot find a match for a two-byte SSL3/TLS
ciphersuite ID, it checks to see whether it has a match for a
three-byte SSL2 ciphersuite ID.  This was causing a read off the end
of the 'cipherid' array.

This was probably harmless in practice, but we shouldn't be having
any uninitialized reads.

(Using ssl23_get_cipher_by_char in this way is a kludge, but then
again the entire existence of the v2 link protocol is kind of a
kludge.  Once Tor 0.2.2 clients are all gone, we can drop this code
entirely.)

Found by starlight. Fix on 0.2.4.8-alpha. Fixes bug 12227.

11 years agofix typo that crept in to 0.2.4.4-alpha
Roger Dingledine [Thu, 24 Jul 2014 21:07:39 +0000 (17:07 -0400)] 
fix typo that crept in to 0.2.4.4-alpha

11 years agoRaise guard threshold to top 25% or 2000 kilounits
Roger Dingledine [Thu, 24 Jul 2014 04:35:47 +0000 (00:35 -0400)] 
Raise guard threshold to top 25% or 2000 kilounits

Authorities now assign the Guard flag to the fastest 25% of the
network (it used to be the fastest 50%). Also raise the consensus
weight that guarantees the Guard flag from 250 to 2000. For the
current network, this results in about 1100 guards, down from 2500.
This step paves the way for moving the number of entry guards
down to 1 (proposal 236) while still providing reasonable expected
performance for most users.

Implements ticket 12690.

11 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Roger Dingledine [Thu, 24 Jul 2014 20:23:08 +0000 (16:23 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

11 years agoupdate manpage for numentryguards / numdirectoryguards
Roger Dingledine [Thu, 24 Jul 2014 16:19:15 +0000 (12:19 -0400)] 
update manpage for numentryguards / numdirectoryguards

11 years agoadd a NumDirectoryGuards consensus param too
Roger Dingledine [Wed, 23 Jul 2014 19:28:40 +0000 (15:28 -0400)] 
add a NumDirectoryGuards consensus param too

11 years agoAdd and use a new NumEntryGuards consensus parameter.
Roger Dingledine [Wed, 23 Jul 2014 16:23:49 +0000 (12:23 -0400)] 
Add and use a new NumEntryGuards consensus parameter.

When specified, it overrides our default of 3 entry guards.

(By default, it overrides the number of directory guards too.)

Implements ticket 12688.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Nick Mathewson [Thu, 24 Jul 2014 01:28:42 +0000 (21:28 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

11 years agoMerge branch 'curve25519-donna32' into maint-0.2.4
Nick Mathewson [Thu, 24 Jul 2014 01:28:18 +0000 (21:28 -0400)] 
Merge branch 'curve25519-donna32' into maint-0.2.4

11 years agoPut the bug number and correct credits in the changes file for the new curve25519...
Nick Mathewson [Thu, 24 Jul 2014 01:25:53 +0000 (21:25 -0400)] 
Put the bug number and correct credits in the changes file for the new curve25519-donna32

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Nick Mathewson [Mon, 21 Jul 2014 18:30:09 +0000 (14:30 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

11 years agoMerge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4
Nick Mathewson [Mon, 21 Jul 2014 18:29:43 +0000 (14:29 -0400)] 
Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Mon, 21 Jul 2014 18:29:30 +0000 (14:29 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

11 years agoupdate changes entry with info for 11578 patch
Nick Mathewson [Mon, 21 Jul 2014 18:00:10 +0000 (14:00 -0400)] 
update changes entry with info for 11578 patch

11 years agoFix warning on building with bufferevents
Sathyanarayanan Gunasekaran [Sun, 20 Jul 2014 23:06:26 +0000 (16:06 -0700)] 
Fix warning on building with bufferevents

Fixes #11578

11 years agoUse safe_str in channel_dumpstats: improve 12184 diagnostic
Nick Mathewson [Fri, 18 Jul 2014 19:20:44 +0000 (21:20 +0200)] 
Use safe_str in channel_dumpstats: improve 12184 diagnostic

11 years agoUpdate geoip6 to the July 10 2014 database.
Karsten Loesing [Fri, 18 Jul 2014 14:31:25 +0000 (16:31 +0200)] 
Update geoip6 to the July 10 2014 database.

11 years agoUpdate geoip to the July 10 2014 database.
Karsten Loesing [Fri, 18 Jul 2014 14:28:50 +0000 (16:28 +0200)] 
Update geoip to the July 10 2014 database.

11 years agoMerge remote-tracking branch 'public/bug12602_024' into maint-0.2.5
Nick Mathewson [Thu, 17 Jul 2014 09:32:16 +0000 (11:32 +0200)] 
Merge remote-tracking branch 'public/bug12602_024' into maint-0.2.5

11 years agoFix compilation with no-compression OpenSSL builds and forks
Nick Mathewson [Thu, 17 Jul 2014 09:25:56 +0000 (11:25 +0200)] 
Fix compilation with no-compression OpenSSL builds and forks

Found because LibreSSL has OPENSSL_NO_COMP always-on, but this
conflicts with the way that _we_ turn off compression.  Patch from
dhill, who attributes it to "OpenBSD".  Fixes bug 12602; bugfix on
0.2.1.1-alpha, which introduced this turn-compression-off code.

11 years agochanges file for 12474, 12438.
Nick Mathewson [Wed, 16 Jul 2014 09:00:49 +0000 (11:00 +0200)] 
changes file for 12474, 12438.

11 years agosrc/or/connection.c: expose bucket_millis_empty for bufferevents test
Anthony G. Basile [Thu, 26 Jun 2014 15:15:36 +0000 (11:15 -0400)] 
src/or/connection.c: expose bucket_millis_empty for bufferevents test

Currently tor fails to build its test when enabled with bufferevents
because an #ifndef USE_BUFFEREVENTS hides bucket_millis_empty() and
friends.  This is fine if we don't run tests, but if we do, we need
these functions in src/or/libtor-testing.a when linking src/test/test.

This patch moves the functions outside the #ifndef and exposes them.

See downstream bug:

https://bugs.gentoo.org/show_bug.cgi?id=510124

11 years agoconfigure.ac: fix build with --enable-bufferevents
Anthony G. Basile [Fri, 20 Jun 2014 12:47:26 +0000 (08:47 -0400)] 
configure.ac: fix build with --enable-bufferevents

When building with bufferevents enabled, configure.ac throws an
error if "$ac_cv_header_event2_bufferevent_ssl_h" is not set to
"yes".  However, nowhere was AC_CHECK_HEADERS(event2/bufferevent_ssl.h)
done.  This commit adds the check.

11 years agodiagnostic for 12184: Add a call to channel_dump_statistics
Nick Mathewson [Wed, 16 Jul 2014 08:34:39 +0000 (10:34 +0200)] 
diagnostic for 12184: Add a call to channel_dump_statistics

11 years agoAdd another 8387 diagnostic
Nick Mathewson [Wed, 16 Jul 2014 08:05:00 +0000 (10:05 +0200)] 
Add another 8387 diagnostic

When we run into bug 8387 (if we run into it again), report when we
last called circuit_expire_old_circuits_clientside().  This will let
us know -- if my fix for 8387 doesn't work -- whether my diagnosis
was at least correct.

Suggested by Andrea.

11 years agoMerge remote-tracking branch 'public/bug8387_024' into maint-0.2.5
Nick Mathewson [Wed, 16 Jul 2014 08:01:56 +0000 (10:01 +0200)] 
Merge remote-tracking branch 'public/bug8387_024' into maint-0.2.5

11 years agoSmall tweaks to make curve25519-donna32 compile with our warnings
Nick Mathewson [Tue, 15 Jul 2014 13:43:40 +0000 (15:43 +0200)] 
Small tweaks to make curve25519-donna32 compile with our warnings

11 years agoUpdate to latest curve25519-donna32
Nick Mathewson [Tue, 15 Jul 2014 13:42:20 +0000 (15:42 +0200)] 
Update to latest curve25519-donna32

11 years agoFix a bug where streams would linger forever when we had no dirinfo
Nick Mathewson [Wed, 9 Jul 2014 20:14:14 +0000 (16:14 -0400)] 
Fix a bug where streams would linger forever when we had no dirinfo

fixes bug 8387; fix on 0.1.1.11-alpha (code), or on 0.2.4.10-alpha (behavior).

11 years agoRemove executable bit from control.c, router.c
Nick Mathewson [Wed, 9 Jul 2014 12:54:08 +0000 (08:54 -0400)] 
Remove executable bit from control.c, router.c

Fix for 12512.

11 years agoBump version to Tor 0.2.5.5-alpha-dev
Nick Mathewson [Wed, 18 Jun 2014 19:01:45 +0000 (15:01 -0400)] 
Bump version to Tor 0.2.5.5-alpha-dev

11 years agoGive 0.2.5.5-alpha a release date tor-0.2.5.5-alpha
Nick Mathewson [Wed, 18 Jun 2014 18:17:45 +0000 (14:17 -0400)] 
Give 0.2.5.5-alpha a release date

11 years agoReflow 0.2.5.5-alpha changelog
Nick Mathewson [Wed, 18 Jun 2014 17:31:44 +0000 (13:31 -0400)] 
Reflow 0.2.5.5-alpha changelog

11 years agochangelog edits from wfn and yawning
Nick Mathewson [Wed, 18 Jun 2014 17:30:30 +0000 (13:30 -0400)] 
changelog edits from wfn and yawning

11 years agoRe-wrap the 0.2.5.5-alpha changelog
Nick Mathewson [Wed, 18 Jun 2014 15:51:27 +0000 (11:51 -0400)] 
Re-wrap the 0.2.5.5-alpha changelog

11 years agoEdit 0.2.5.5-alpha changelog for terseness and grammar.
Nick Mathewson [Wed, 18 Jun 2014 15:49:50 +0000 (11:49 -0400)] 
Edit 0.2.5.5-alpha changelog for terseness and grammar.

11 years agobump version to 0.2.5.5-alpha. Not released yet.
Nick Mathewson [Mon, 16 Jun 2014 19:32:35 +0000 (15:32 -0400)] 
bump version to 0.2.5.5-alpha.  Not released yet.

11 years agowhitespace fixes
Nick Mathewson [Mon, 16 Jun 2014 19:18:02 +0000 (15:18 -0400)] 
whitespace fixes

11 years agoBring remaining 0.2.5.5-alpha entries into changelog
Nick Mathewson [Mon, 16 Jun 2014 19:00:10 +0000 (15:00 -0400)] 
Bring remaining 0.2.5.5-alpha entries into changelog

11 years agomanpage: Move more authority-only options into the authority section
Nick Mathewson [Mon, 16 Jun 2014 15:15:47 +0000 (11:15 -0400)] 
manpage: Move more authority-only options into the authority section

I don't know whether we missed these or misclassified them when we
first made the "DIRECTORY AUTHORITY SERVER OPTIONS" section, but they
really belong there.

11 years agoAdd ATTR_UNUSED to HT_FIND
Nick Mathewson [Sat, 14 Jun 2014 15:46:54 +0000 (11:46 -0400)] 
Add ATTR_UNUSED to HT_FIND

The fix for bug 8746 added a hashtable instance that never actually
invoked HT_FIND.  This caused a warning, since we didn't mark HT_FIND
as okay-not-to-use.

11 years agoMerge branch 'bug8746_v2_squashed'
Nick Mathewson [Sat, 14 Jun 2014 15:46:38 +0000 (11:46 -0400)] 
Merge branch 'bug8746_v2_squashed'

Conflicts:
src/common/include.am

11 years agochanges file for 8746
Nick Mathewson [Wed, 30 Apr 2014 17:13:38 +0000 (13:13 -0400)] 
changes file for 8746

11 years agorefactor win/nix handling for test_spawn_background*()
Nick Mathewson [Wed, 30 Apr 2014 17:00:54 +0000 (13:00 -0400)] 
refactor win/nix handling for test_spawn_background*()

Instead of having a #if ... for every function, just define
TEST_CHILD to the right patch and EOL to the expected line terminator.

11 years agoMore unit tests for process spawning
Nick Mathewson [Wed, 30 Apr 2014 16:50:00 +0000 (12:50 -0400)] 
More unit tests for process spawning

Try killing a running process; try noticing that a process has
exited without checking its output; verify that waitpid_cb (when
present) is set to NULL when you would expect it to be.

11 years agoNew testing-only tor_sleep_msec function
Nick Mathewson [Wed, 30 Apr 2014 16:48:46 +0000 (12:48 -0400)] 
New testing-only tor_sleep_msec function

In the unit tests I want to loop with a delay, but I want less than
a 1 second delay.  This, sadly, requires compatibility code.

11 years agoOn Windows, terminate processes by handle, not pid
Nick Mathewson [Thu, 10 Apr 2014 15:16:42 +0000 (11:16 -0400)] 
On Windows, terminate processes by handle, not pid

When we create a process yourself with CreateProcess, we get a
handle to the process in the PROCESS_INFO output structure.  But
instead of using that handle, we were manually looking up a _new_
handle based on the process ID, which is a poor idea, since the
process ID might refer to a new process later on, but the handle
can't.

11 years agoUse waitpid code to learn when a controlled process dies
Nick Mathewson [Thu, 10 Apr 2014 15:06:10 +0000 (11:06 -0400)] 
Use waitpid code to learn when a controlled process dies

This lets us avoid sending SIGTERM to something that has already
died, since we realize it has already died, and is a fix for the
unix version of #8746.

11 years agoNew waitpid-handler functions to run callbacks when a child exits.
Nick Mathewson [Wed, 9 Apr 2014 17:45:27 +0000 (13:45 -0400)] 
New waitpid-handler functions to run callbacks when a child exits.

Also, move 'procmon' into libor_event library, since it uses libevent.

11 years agoMerge branch 'bug12184_diagnostic_squashed'
Nick Mathewson [Sat, 14 Jun 2014 15:01:04 +0000 (11:01 -0400)] 
Merge branch 'bug12184_diagnostic_squashed'

11 years agoTry to diagnose bug 12184
Nick Mathewson [Tue, 10 Jun 2014 17:35:45 +0000 (13:35 -0400)] 
Try to diagnose bug 12184

Check for consistency between the queued destroy cells and the marked
circuit IDs.  Check for consistency in the count of queued destroy
cells in several ways.  Check to see whether any of the marked circuit
IDs have somehow been marked longer than the channel has existed.

11 years agoMerge branch 'bug12191_squashed'
Nick Mathewson [Fri, 13 Jun 2014 12:40:59 +0000 (08:40 -0400)] 
Merge branch 'bug12191_squashed'

11 years agoAlso raise the check for 0 circuit ID in created cell.
Nick Mathewson [Wed, 11 Jun 2014 13:33:20 +0000 (09:33 -0400)] 
Also raise the check for 0 circuit ID in created cell.

And add a comment about why conditions that would cause us to drop a
cell should get checked before actions that would cause us to send a
destroy cell.

Spotted by 'cypherpunks'.

And note that these issues have been present since 0.0.8pre1 (commit
0da256ef), where we added a "shutting down" state, and started
responding to all create cells with DESTROY when shutting down.

11 years agosandbox: Permit stat() of DataDir/stats
Nick Mathewson [Fri, 13 Jun 2014 12:26:23 +0000 (08:26 -0400)] 
sandbox: Permit stat() of DataDir/stats

This is a fix for another case of 12064 that alphawolf just spotted.

There's already an 0.2.5.5 changelog entry for this.

11 years agowhitespaces fixes
Nick Mathewson [Wed, 11 Jun 2014 16:00:14 +0000 (12:00 -0400)] 
whitespaces fixes

11 years agoMerge remote-tracking branch 'public/ticket6799_024_v2_squashed'
Nick Mathewson [Wed, 11 Jun 2014 15:57:56 +0000 (11:57 -0400)] 
Merge remote-tracking branch 'public/ticket6799_024_v2_squashed'

Conflicts:
src/or/channel.c
src/or/circuitlist.c
src/or/connection.c

Conflicts involved removal of next_circ_id and addition of
unusable-circid tracking.

11 years agoTweak changes entry for 6799
Nick Mathewson [Wed, 11 Jun 2014 15:52:58 +0000 (11:52 -0400)] 
Tweak changes entry for 6799

11 years agoFix a 32-big conversion warning in 11970 fix
Nick Mathewson [Wed, 11 Jun 2014 15:29:44 +0000 (11:29 -0400)] 
Fix a 32-big conversion warning in 11970 fix

11 years agoReplace last_added_nonpadding with last_had_circuits
Nick Mathewson [Fri, 16 May 2014 14:32:31 +0000 (10:32 -0400)] 
Replace last_added_nonpadding with last_had_circuits

The point of the "idle timeout" for connections is to kill the
connection a while after it has no more circuits.  But using "last
added a non-padding cell" as a proxy for that is wrong, since if the
last circuit is closed from the other side of the connection, we
will not have sent anything on that connection since well before the
last circuit closed.

This is part of fixing 6799.

When applied to 0.2.5, it is also a fix for 12023.

11 years agoGive each or_connection_t a slightly randomized idle_timeout
Nick Mathewson [Wed, 9 Apr 2014 15:13:37 +0000 (11:13 -0400)] 
Give each or_connection_t a slightly randomized idle_timeout

Instead of killing an or_connection_t that has had no circuits for
the last 3 minutes, give every or_connection_t a randomized timeout,
so that an observer can't so easily infer from the connection close
time the time at which its last circuit closed.

Also, increase the base timeout for canonical connections from 3
minutes to 15 minutes.

Fix for ticket 6799.

11 years agoMerge remote-tracking branch 'public/bug11970'
Nick Mathewson [Wed, 11 Jun 2014 15:01:52 +0000 (11:01 -0400)] 
Merge remote-tracking branch 'public/bug11970'

11 years agoYield a real error in the bug case of sandbox_getaddrinfo()
Nick Mathewson [Wed, 11 Jun 2014 15:00:56 +0000 (11:00 -0400)] 
Yield a real error in the bug case of sandbox_getaddrinfo()

11 years agoMerge remote-tracking branch 'public/not_bug8093'
Nick Mathewson [Wed, 11 Jun 2014 13:24:16 +0000 (09:24 -0400)] 
Merge remote-tracking branch 'public/not_bug8093'

11 years agoMerge remote-tracking branch 'public/more_bug8387_diagnosis'
Nick Mathewson [Wed, 11 Jun 2014 13:22:46 +0000 (09:22 -0400)] 
Merge remote-tracking branch 'public/more_bug8387_diagnosis'

11 years agoMove circuit-id-in-use check for CREATE cells to before all other checks
Nick Mathewson [Wed, 11 Jun 2014 02:41:13 +0000 (22:41 -0400)] 
Move circuit-id-in-use check for CREATE cells to before all other checks

This means that we never send a DESTROY cell in response to an attempt
to CREATE an existing circuit.  Fixes bug 12191.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Wed, 11 Jun 2014 01:09:27 +0000 (21:09 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoFix changes file for geoip
Nick Mathewson [Wed, 11 Jun 2014 01:08:44 +0000 (21:08 -0400)] 
Fix changes file for geoip

11 years agoMerge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4
Nick Mathewson [Wed, 11 Jun 2014 01:08:12 +0000 (21:08 -0400)] 
Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4