]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
11 years agoSplit crypto_global_init() into pre/post config
Nick Mathewson [Wed, 12 Feb 2014 16:56:29 +0000 (11:56 -0500)] 
Split crypto_global_init() into pre/post config

It's increasingly apparent that we want to make sure we initialize our
PRNG nice and early, or else OpenSSL will do it for us.  (OpenSSL
doesn't do _too_ bad a job, but it's nice to do it ourselves.)

We'll also need this for making sure we initialize the siphash key
before we do any hashes.

11 years agoSiphash-2-4 is now our hash in nearly all cases.
Nick Mathewson [Fri, 7 Feb 2014 22:38:16 +0000 (17:38 -0500)] 
Siphash-2-4 is now our hash in nearly all cases.

I've made an exception for cases where I'm sure that users can't
influence the inputs.  This is likely to cause a slowdown somewhere,
but it's safer to siphash everything and *then* look for cases to
optimize.

This patch doesn't actually get us any _benefit_ from siphash yet,
since we don't really randomize the key at any point.

11 years agocsiphash: Add functions to take a global key.
Nick Mathewson [Wed, 12 Feb 2014 16:27:03 +0000 (11:27 -0500)] 
csiphash: Add functions to take a global key.

11 years agoTests for siphash, from reference implementation.
Nick Mathewson [Wed, 12 Feb 2014 15:58:03 +0000 (10:58 -0500)] 
Tests for siphash, from reference implementation.

11 years agocsiphash: avoid unaligned access on non-x86
Nick Mathewson [Wed, 12 Feb 2014 15:39:22 +0000 (10:39 -0500)] 
csiphash: avoid unaligned access on non-x86

11 years agoGet csiphash better integrated with our build system
Nick Mathewson [Wed, 12 Feb 2014 15:24:04 +0000 (10:24 -0500)] 
Get csiphash better integrated with our build system

11 years agoRaw import of Marek Majkowski's cisphash.c
Nick Mathewson [Wed, 12 Feb 2014 15:09:45 +0000 (10:09 -0500)] 
Raw import of Marek Majkowski's cisphash.c

siphash is a hash function designed for producing hard-to-predict
64-bit outputs from short inputs and a 128-bit key.  It's chosen for
security and speed.

See https://131002.net/siphash/ for more information on siphash.

Source: https://github.com/majek/csiphash/

11 years agoMerge remote-tracking branch 'public/no_itime_queue_025'
Nick Mathewson [Tue, 11 Feb 2014 16:52:35 +0000 (11:52 -0500)] 
Merge remote-tracking branch 'public/no_itime_queue_025'

11 years agoMerge branch 'bug10881'
Nick Mathewson [Tue, 11 Feb 2014 16:42:06 +0000 (11:42 -0500)] 
Merge branch 'bug10881'

11 years agoTweak DirAuthority documentation
Nick Mathewson [Tue, 11 Feb 2014 16:34:32 +0000 (11:34 -0500)] 
Tweak DirAuthority documentation

Per a comment from karsten, there is no longer v2 authority support,
so stop pretending there is. Also, fix a grammar error.x

11 years agoMerge remote-tracking branch 'karsten/one-dirauth'
Nick Mathewson [Tue, 11 Feb 2014 15:15:03 +0000 (10:15 -0500)] 
Merge remote-tracking branch 'karsten/one-dirauth'

11 years agoMerge remote-tracking branch 'public/bug10722'
Nick Mathewson [Tue, 11 Feb 2014 15:08:58 +0000 (10:08 -0500)] 
Merge remote-tracking branch 'public/bug10722'

11 years agoAdd changes file for ticket 10842.
Karsten Loesing [Tue, 11 Feb 2014 07:44:35 +0000 (08:44 +0100)] 
Add changes file for ticket 10842.

This is a bugfix on 0.2.2.26-beta, because 6b83b3b made directory
authorities remove themselves from the list of directory authorities to
upload to, but didn't suppress the warning in case they're the only
directory authority in the network.

11 years agoRemove options for configuring HS authorities.
Nick Mathewson [Tue, 11 Feb 2014 03:41:52 +0000 (22:41 -0500)] 
Remove options for configuring HS authorities.

(There is no longer meaningfully any such thing as a HS authority,
since we stopped uploading or downloading v0 hs descriptors in
0.2.2.1-alpha.)

Implements #10881, and part of #10841.

11 years agofix trivial typo
Roger Dingledine [Mon, 10 Feb 2014 21:05:35 +0000 (16:05 -0500)] 
fix trivial typo

11 years agoMerge remote-tracking branch 'public/no_itime_queue'
Nick Mathewson [Mon, 10 Feb 2014 20:04:23 +0000 (15:04 -0500)] 
Merge remote-tracking branch 'public/no_itime_queue'

The conflicts here were tricky, and required me to eliminate the
command-queue as well.  That wasn't so hard.

Conflicts:
src/or/or.h
src/or/relay.c

11 years agoExcise the insertion_time_elem_t logic
Nick Mathewson [Mon, 10 Feb 2014 18:55:27 +0000 (13:55 -0500)] 
Excise the insertion_time_elem_t logic

It's now redundant with the inserted_time field in packed_cell_t

Fixes bug 10870.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Mon, 10 Feb 2014 02:41:59 +0000 (21:41 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge remote-tracking branch 'andrea/bug9602' into maint-0.2.4
Nick Mathewson [Mon, 10 Feb 2014 02:41:24 +0000 (21:41 -0500)] 
Merge remote-tracking branch 'andrea/bug9602' into maint-0.2.4

11 years agoMake sure orconn->chan gets nulled out when channels exit from channel_free_all(...
Andrea Shepard [Sat, 8 Feb 2014 22:05:51 +0000 (14:05 -0800)] 
Make sure orconn->chan gets nulled out when channels exit from channel_free_all() too

11 years agoSuppress warning in networks with only 1 dirauth.
Karsten Loesing [Sat, 8 Feb 2014 10:02:27 +0000 (11:02 +0100)] 
Suppress warning in networks with only 1 dirauth.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Fri, 7 Feb 2014 22:41:41 +0000 (17:41 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoSurvive fedora's openssl in our benchmarks
Nick Mathewson [Fri, 7 Feb 2014 22:36:11 +0000 (17:36 -0500)] 
Survive fedora's openssl in our benchmarks

Apparently fedora currently has ECDH but not P224. This isn't a huge
deal, since we no longer use OpenSSL's P224 ever (see #9780 and
72c1e5acfe1c6). But we shouldn't have segfaulting benchmarks really.

Fixes bug 10835; bugfix on 0.2.4.8-alpha.

11 years agoExplain CURVE25519_ENABLED: closes 9774
Nick Mathewson [Fri, 7 Feb 2014 21:16:56 +0000 (16:16 -0500)] 
Explain CURVE25519_ENABLED: closes 9774

11 years agoUse the right functions; strncpy is usually not the answer
Nick Mathewson [Fri, 7 Feb 2014 17:25:49 +0000 (12:25 -0500)] 
Use the right functions; strncpy is usually not the answer

11 years agoMerge remote-tracking branch 'houqp/hs_control_fix'
Nick Mathewson [Fri, 7 Feb 2014 17:22:56 +0000 (12:22 -0500)] 
Merge remote-tracking branch 'houqp/hs_control_fix'

11 years agoRemove a needless check in channel_tls_handle_incoming
Nick Mathewson [Fri, 7 Feb 2014 17:01:16 +0000 (12:01 -0500)] 
Remove a needless check in channel_tls_handle_incoming

This patch removes an "if (chan)" that occurred at a place where
chan was definitely non-NULL.  Having it there made some static
analysis tools conclude that we were up to shenanigans.

This resolves #9979.

11 years agoMerge the circuit_{free,clear}_cpath functions
Nick Mathewson [Fri, 7 Feb 2014 15:50:06 +0000 (10:50 -0500)] 
Merge the circuit_{free,clear}_cpath functions

(Based on a suggestion by arma at #9777)

11 years agoMerge remote-tracking branch 'public/feature9777_024_squashed'
Nick Mathewson [Fri, 7 Feb 2014 15:47:34 +0000 (10:47 -0500)] 
Merge remote-tracking branch 'public/feature9777_024_squashed'

Conflicts:
src/or/circuitbuild.c

11 years agoDiscard circuit paths on which nobody supports ntor
Nick Mathewson [Thu, 6 Feb 2014 22:08:50 +0000 (17:08 -0500)] 
Discard circuit paths on which nobody supports ntor

Right now this accounts for about 1% of circuits over all, but if you
pick a guard that's running 0.2.3, it will be about 6% of the circuits
running through that guard.

Making sure that every circuit has at least one ntor link means that
we're getting plausibly good forward secrecy on every circuit.

This implements ticket 9777,

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Fri, 7 Feb 2014 15:38:24 +0000 (10:38 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoAttribute bug 9602 to a version.
Nick Mathewson [Fri, 7 Feb 2014 15:38:00 +0000 (10:38 -0500)] 
Attribute bug 9602 to a version.

11 years agoNULL out conns on tlschans when freeing in case channel_run_cleanup() is late; fixes...
Andrea Shepard [Thu, 6 Feb 2014 22:47:34 +0000 (14:47 -0800)] 
NULL out conns on tlschans when freeing in case channel_run_cleanup() is late; fixes bug 9602

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 6 Feb 2014 21:29:33 +0000 (16:29 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge remote-tracking branch 'public/bug9716_024' into maint-0.2.4
Nick Mathewson [Thu, 6 Feb 2014 21:29:08 +0000 (16:29 -0500)] 
Merge remote-tracking branch 'public/bug9716_024' into maint-0.2.4

11 years agoMerge remote-tracking branch 'public/bug10543_024_v2'
Nick Mathewson [Thu, 6 Feb 2014 21:25:26 +0000 (16:25 -0500)] 
Merge remote-tracking branch 'public/bug10543_024_v2'

11 years agoMake the handling for usable-exit counting handle ExitNodes better
Nick Mathewson [Fri, 17 Jan 2014 18:39:04 +0000 (13:39 -0500)] 
Make the handling for usable-exit counting handle ExitNodes better

It's possible to set your ExitNodes to contains only exits that don't
have the Exit flag.  If you do that, we'll decide that 0 of your exits
are working.  Instead, in that case we should look at nodes which have
(or which might have) exit policies that don't reject everything.

Fix for bug 10543; bugfix on 0.2.4.10-alpha.

11 years agoadd test case for node_get_verbose_nickname
Qingping Hou [Wed, 5 Feb 2014 01:52:48 +0000 (20:52 -0500)] 
add test case for node_get_verbose_nickname

11 years agoadd test for node_get_verbose_nickname_by_id
Qingping Hou [Wed, 5 Feb 2014 00:54:09 +0000 (19:54 -0500)] 
add test for node_get_verbose_nickname_by_id

11 years agoremove node_describe_by_id() function
Qingping Hou [Wed, 5 Feb 2014 00:40:55 +0000 (19:40 -0500)] 
remove node_describe_by_id() function

This function is not used anymore

11 years agofix longname returned in HS_DESC control events
Qingping Hou [Wed, 5 Feb 2014 00:33:48 +0000 (19:33 -0500)] 
fix longname returned in HS_DESC control events

According to control spec, longname should not contain any spaces and is
consists only of identy_digest + nickname

added two functions:
* node_get_verbose_nickname_by_id()
* node_describe_longname_by_id()

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 6 Feb 2014 21:12:42 +0000 (16:12 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agochangelog for 10793
Nick Mathewson [Mon, 3 Feb 2014 15:47:49 +0000 (10:47 -0500)] 
changelog for 10793

11 years agoSome anti-forensics paranoia...
Florent Daigniere [Sun, 2 Feb 2014 18:40:30 +0000 (18:40 +0000)] 
Some anti-forensics paranoia...

sed -i 's/BN_free/BN_clear_free/g'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 6 Feb 2014 18:27:04 +0000 (13:27 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts:
changes/bug10485
src/or/rephist.c
src/or/status.c

11 years agoAdd a missing include
Nick Mathewson [Thu, 6 Feb 2014 18:25:36 +0000 (13:25 -0500)] 
Add a missing include

11 years agoMerge branch 'bug10485_024' into maint-0.2.4
Nick Mathewson [Thu, 6 Feb 2014 18:24:12 +0000 (13:24 -0500)] 
Merge branch 'bug10485_024' into maint-0.2.4

11 years agoDeliver circuit handshake counts as part of the heartbeat
Nick Mathewson [Thu, 6 Feb 2014 18:03:01 +0000 (13:03 -0500)] 
Deliver circuit handshake counts as part of the heartbeat

Previously, they went out once an hour, unconditionally.

Fixes 10485; bugfix on 0.2.4.17-rc.

11 years agoRename sun to s_un in test_addr.c
Nick Mathewson [Thu, 6 Feb 2014 17:36:33 +0000 (12:36 -0500)] 
Rename sun to s_un in test_addr.c

Apparently the compiler on solaris 9 didn't like "sun" as an identifier.

Fix for bug 10565; bugfix on 0.2.5.1-alpha.

11 years agoDistcheck repair: add new python testing code to "tarballs"
Nick Mathewson [Tue, 4 Feb 2014 16:07:43 +0000 (11:07 -0500)] 
Distcheck repair: add new python testing code to "tarballs"

'make distcheck' now passes again.

11 years agotest_config.c: log which address should have failed
Nick Mathewson [Mon, 3 Feb 2014 21:21:32 +0000 (16:21 -0500)] 
test_config.c: log which address should have failed

11 years agoClean up test_hs.c: warning fix; tor_free() usage.
Nick Mathewson [Mon, 3 Feb 2014 21:12:30 +0000 (16:12 -0500)] 
Clean up test_hs.c: warning fix; tor_free() usage.

My OSX laptop rightly gave a warning because of sticking strlen() into
an int, but once I took a closer look... it appears that the strlen()
was part of a needlessly verbose implementation for tor_strdup().

While I was there, I fixed the usage of tor_free() in test_hs.c: It
checks for NULL, and it zeros its argument.  So instead of
    if (foo) {
      tor_free(foo);
      foo = NULL;
    }
we should just say
    tor_free(foo);

11 years agoTransProxyType replaces TransTPROXY option
Nick Mathewson [Mon, 3 Feb 2014 18:56:19 +0000 (13:56 -0500)] 
TransProxyType replaces TransTPROXY option

I'm making this change now since ipfw will want its own option too,
and proliferating options here isn't sensible.

(See #10582 and #10267)

11 years agoMore fixes to rip out all of the v2 directory code.
Karsten Loesing [Thu, 30 Jan 2014 11:48:49 +0000 (12:48 +0100)] 
More fixes to rip out all of the v2 directory code.

(This was a squash commit, but I forgot to squash it. Sorry! --Nick)

11 years ago10365: Close connections if the VERSIONS cell has an odd length.
rl1987 [Tue, 24 Dec 2013 19:50:58 +0000 (21:50 +0200)] 
10365: Close connections if the VERSIONS cell has an odd length.

Fixes issue 10365.

11 years agocheck-spaces fixes for test_router.c
Nick Mathewson [Mon, 3 Feb 2014 18:00:15 +0000 (13:00 -0500)] 
check-spaces fixes for test_router.c

11 years agoDefensive programming in control_event_hs_descriptor_*
Nick Mathewson [Mon, 3 Feb 2014 17:35:35 +0000 (12:35 -0500)] 
Defensive programming in control_event_hs_descriptor_*

It looks to me like these functions can never get called with NULL
arguments, but better safe than sorry.

11 years agoMerge remote-tracking branch 'houqp/hs_control'
Nick Mathewson [Mon, 3 Feb 2014 17:28:42 +0000 (12:28 -0500)] 
Merge remote-tracking branch 'houqp/hs_control'

11 years agoslownacl's pure-python curve25519 lets us test ntor everywhere.
Nick Mathewson [Mon, 3 Feb 2014 16:34:13 +0000 (11:34 -0500)] 
slownacl's pure-python curve25519 lets us test ntor everywhere.

Improvement on f308adf8382bc7e61ea05a172, where we made the ntor
unit tests run everywhere... so long as a python curve25519 module
was installed.  Now the unit tests don't require that module.

11 years agoMerge remote-tracking branch 'public/bug10758'
Nick Mathewson [Mon, 3 Feb 2014 16:05:29 +0000 (11:05 -0500)] 
Merge remote-tracking branch 'public/bug10758'

11 years agochangelog for 10793
Nick Mathewson [Mon, 3 Feb 2014 15:47:49 +0000 (10:47 -0500)] 
changelog for 10793

11 years agoSome anti-forensics paranoia...
Florent Daigniere [Sun, 2 Feb 2014 18:40:30 +0000 (18:40 +0000)] 
Some anti-forensics paranoia...

sed -i 's/BN_free/BN_clear_free/g'

11 years agoMerge branch 'feature_10582'
Nick Mathewson [Sun, 2 Feb 2014 20:48:27 +0000 (15:48 -0500)] 
Merge branch 'feature_10582'

11 years agoAdd a sandbox rule to allow IP_TRANSPARENT
Nick Mathewson [Sun, 2 Feb 2014 20:47:48 +0000 (15:47 -0500)] 
Add a sandbox rule to allow IP_TRANSPARENT

11 years agoMove the friendly warning about TPROXY and root to EPERM time
Nick Mathewson [Sun, 2 Feb 2014 20:45:00 +0000 (15:45 -0500)] 
Move the friendly warning about TPROXY and root to EPERM time

I'm doing this because:
   * User doesn't mean you're running as root, and running as root
     doesn't mean you've set User.
   * It's possible that the user has done some other
     capability-based hack to retain the necessary privileges.

11 years agoAdd support for TPROXY via new TransTPRoxy option
Nick Mathewson [Fri, 31 Jan 2014 17:59:35 +0000 (12:59 -0500)] 
Add support for TPROXY via new TransTPRoxy option

Based on patch from "thomo" at #10582.

11 years agoadd test case for node_describe_by_id
Qingping Hou [Sun, 26 Jan 2014 05:18:55 +0000 (00:18 -0500)] 
add test case for node_describe_by_id

11 years agoadd test case for hidden service async events
Qingping Hou [Wed, 18 Dec 2013 06:40:05 +0000 (01:40 -0500)] 
add test case for hidden service async events

11 years agoadd hidden service descriptor async control event
Qingping Hou [Wed, 9 Oct 2013 15:13:06 +0000 (11:13 -0400)] 
add hidden service descriptor async control event

11 years agoadd change log for hs_desc async event
Qingping Hou [Wed, 9 Oct 2013 15:47:54 +0000 (11:47 -0400)] 
add change log for hs_desc async event

11 years agoRip out all of the v2 directory code.
Nick Mathewson [Wed, 29 Jan 2014 20:17:05 +0000 (15:17 -0500)] 
Rip out all of the v2 directory code.

The remaining vestige is that we continue to publish the V2dir flag,
and that, for the controller, we continue to emit v2 directory
formats when requested.

11 years agosort the changes entries that nick added
Roger Dingledine [Mon, 27 Jan 2014 00:48:57 +0000 (19:48 -0500)] 
sort the changes entries that nick added

also replace them with the versions of the changelog stanzas from
release-0.2.4, for consistency

11 years agoApply StrictNodes to hidden service directories early
Nick Mathewson [Fri, 24 Jan 2014 17:56:10 +0000 (12:56 -0500)] 
Apply StrictNodes to hidden service directories early

Previously, we would sometimes decide in directory_get_from_hs_dir()
to connect to an excluded node, and then later in
directory_initiate_command_routerstatus_rend() notice that it was
excluded and strictnodes was set, and catch it as a stopgap.

Additionally, this patch preferentially tries to fetch from
non-excluded nodes even when StrictNodes is off.

Fix for bug #10722. Bugfix on 0.2.0.10-alpha (the v2 hidserv directory
system was introduced in e136f00ca). Reported by "mr-4".

11 years agoDocument more coverage tricks in doc/HACKING
Nick Mathewson [Tue, 21 Jan 2014 21:44:48 +0000 (16:44 -0500)] 
Document more coverage tricks in doc/HACKING

11 years agoAdd some more options to the findMoreChanges.pl kludge-script
Nick Mathewson [Mon, 20 Jan 2014 20:47:54 +0000 (15:47 -0500)] 
Add some more options to the findMoreChanges.pl kludge-script

11 years agoNote a missing number.
Nick Mathewson [Mon, 20 Jan 2014 20:45:49 +0000 (15:45 -0500)] 
Note a missing number.

11 years agoIncorporate changes from 0.2.4.20 into 0.2.5.2 changelog-in-progress
Nick Mathewson [Mon, 20 Jan 2014 20:44:31 +0000 (15:44 -0500)] 
Incorporate changes from 0.2.4.20 into 0.2.5.2 changelog-in-progress

11 years agoMove all merged-in-0.2.4.18-rc items into 0.2.5.2-alpha changelog section.
Nick Mathewson [Mon, 20 Jan 2014 20:41:06 +0000 (15:41 -0500)] 
Move all merged-in-0.2.4.18-rc items into 0.2.5.2-alpha changelog section.

11 years agowhitespace fixes
Nick Mathewson [Fri, 17 Jan 2014 17:41:56 +0000 (12:41 -0500)] 
whitespace fixes

11 years agoCoverate in util.c: test that tor_parse_* rejects negative base.
Nick Mathewson [Mon, 13 Jan 2014 21:38:48 +0000 (16:38 -0500)] 
Coverate in util.c: test that tor_parse_* rejects negative base.

11 years agoAdd an --accel switch to run unit tests with crypto acceleration
Nick Mathewson [Mon, 13 Jan 2014 21:34:28 +0000 (16:34 -0500)] 
Add an --accel switch to run unit tests with crypto acceleration

11 years agoFix some seccomp2 issues
Nick Mathewson [Mon, 6 Jan 2014 09:27:58 +0000 (04:27 -0500)] 
Fix some seccomp2 issues

Fix for #10563.  This is a compatibility issue with libseccomp-2.1.
I guess you could call it a bugfix on 0.2.5.1?

11 years agoAdd explicit check for 0-length extend2 cells
Nick Mathewson [Fri, 3 Jan 2014 15:43:09 +0000 (10:43 -0500)] 
Add explicit check for 0-length extend2 cells

This is harmless in the Tor of today, but important for correctness.

Fixes bug 10536; bugfix on 0.2.4.8-alpha. Reported by "cypherpunks".

11 years agoMerge remote-tracking branch 'public/bug10485'
Nick Mathewson [Tue, 24 Dec 2013 16:42:35 +0000 (11:42 -0500)] 
Merge remote-tracking branch 'public/bug10485'

11 years agoMove onion-type stats message into heartbeat
Nick Mathewson [Tue, 24 Dec 2013 16:41:48 +0000 (11:41 -0500)] 
Move onion-type stats message into heartbeat

Fix for 10485. Fix on 0.2.4.17-alpha.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Tue, 24 Dec 2013 00:01:29 +0000 (19:01 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoClarify DirPort multiplicity
Nick Mathewson [Tue, 24 Dec 2013 00:00:46 +0000 (19:00 -0500)] 
Clarify DirPort multiplicity

Fix for #10470 as suggested by arma

11 years agoand forward-port those lines too
Roger Dingledine [Sun, 22 Dec 2013 23:37:49 +0000 (18:37 -0500)] 
and forward-port those lines too

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Sun, 22 Dec 2013 22:26:25 +0000 (17:26 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge branch 'bug10465' into maint-0.2.4
Nick Mathewson [Sun, 22 Dec 2013 22:20:22 +0000 (17:20 -0500)] 
Merge branch 'bug10465' into maint-0.2.4

11 years agoFix automapping to ipv6
Nick Mathewson [Sun, 22 Dec 2013 13:38:36 +0000 (08:38 -0500)] 
Fix automapping to ipv6

Bugfix on 0.2.4.7-alpha; fixes bug 10465.

11 years agoforward-port recent changelogs and release notes
Roger Dingledine [Sun, 22 Dec 2013 09:30:06 +0000 (04:30 -0500)] 
forward-port recent changelogs and release notes

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Sun, 22 Dec 2013 02:16:06 +0000 (21:16 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge branch 'bug10456' into maint-0.2.4
Nick Mathewson [Sun, 22 Dec 2013 02:15:39 +0000 (21:15 -0500)] 
Merge branch 'bug10456' into maint-0.2.4

11 years agoFix a logic error in circuit_stream_is_being_handled.
Nick Mathewson [Sat, 21 Dec 2013 15:15:09 +0000 (10:15 -0500)] 
Fix a logic error in circuit_stream_is_being_handled.

When I introduced the unusable_for_new_circuits flag in
62fb209d837f3f551, I had a spurious ! in the
circuit_stream_is_being_handled loop.  This made us decide that
non-unusable circuits (that is, usable ones) were the ones to avoid,
and caused it to launch a bunch of extra circuits.

Fixes bug 10456; bugfix on 0.2.4.12-alpha.

11 years agoMerge remote-tracking branch 'linus/bug10324'
Nick Mathewson [Fri, 20 Dec 2013 16:40:21 +0000 (11:40 -0500)] 
Merge remote-tracking branch 'linus/bug10324'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 19 Dec 2013 03:04:21 +0000 (22:04 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts:
src/common/crypto.c

11 years agoMerge branch 'bug10402_redux_024' into maint-0.2.4
Nick Mathewson [Thu, 19 Dec 2013 02:55:06 +0000 (21:55 -0500)] 
Merge branch 'bug10402_redux_024' into maint-0.2.4

11 years agoNever allow OpenSSL engines to replace the RAND_SSLeay method
Nick Mathewson [Wed, 18 Dec 2013 16:49:44 +0000 (11:49 -0500)] 
Never allow OpenSSL engines to replace the RAND_SSLeay method

This fixes bug 10402, where the rdrand engine would use the rdrand
instruction, not as an additional entropy source, but as a replacement
for the entire userspace PRNG.  That's obviously stupid: even if you
don't think that RDRAND is a likely security risk, the right response
to an alleged new alleged entropy source is never to throw away all
previously used entropy sources.

Thanks to coderman and rl1987 for diagnosing and tracking this down.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Tue, 17 Dec 2013 18:54:02 +0000 (13:54 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.4'