]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
11 years agoMerge branch 'bug13295_v2_025' into maint-0.2.5
Nick Mathewson [Mon, 29 Sep 2014 17:02:35 +0000 (13:02 -0400)] 
Merge branch 'bug13295_v2_025' into maint-0.2.5

11 years agoDon't use the getaddrinfo sandbox cache from tor-resolve
Nick Mathewson [Mon, 29 Sep 2014 16:57:07 +0000 (12:57 -0400)] 
Don't use the getaddrinfo sandbox cache from tor-resolve

Fixes bug 13295; bugfix on 0.2.5.3-alpha.

The alternative here is to call crypto_global_init() from tor-resolve,
but let's avoid linking openssl into tor-resolve for as long as we
can.

11 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Roger Dingledine [Sat, 20 Sep 2014 20:50:32 +0000 (16:50 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

Conflicts:
src/or/config.c

11 years agoMerge branch 'maint-0.2.3' into maint-0.2.4
Roger Dingledine [Sat, 20 Sep 2014 20:49:24 +0000 (16:49 -0400)] 
Merge branch 'maint-0.2.3' into maint-0.2.4

11 years agogabelmoo's IPv4 address changed
Sebastian Hahn [Fri, 19 Sep 2014 11:40:37 +0000 (13:40 +0200)] 
gabelmoo's IPv4 address changed

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 16 Sep 2014 15:10:02 +0000 (11:10 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

11 years agoclients now send correct address for rendezvous point
Roger Dingledine [Sun, 14 Sep 2014 01:49:37 +0000 (21:49 -0400)] 
clients now send correct address for rendezvous point

Clients now send the correct address for their chosen rendezvous point
when trying to access a hidden service. They used to send the wrong
address, which would still work some of the time because they also
sent the identity digest of the rendezvous point, and if the hidden
service happened to try connecting to the rendezvous point from a relay
that already had a connection open to it, the relay would reuse that
connection. Now connections to hidden services should be more robust
and faster. Also, this bug meant that clients were leaking to the hidden
service whether they were on a little-endian (common) or big-endian (rare)
system, which for some users might have reduced their anonymity.

Fixes bug 13151; bugfix on 0.2.1.5-alpha.

11 years agoBump maint-0.2.5 to 0.2.5.7-rc-dev
Nick Mathewson [Fri, 12 Sep 2014 01:38:32 +0000 (21:38 -0400)] 
Bump maint-0.2.5 to 0.2.5.7-rc-dev

11 years agoReduce log severity for unused ClientTransportPlugin lines
Roger Dingledine [Thu, 11 Sep 2014 12:02:37 +0000 (08:02 -0400)] 
Reduce log severity for unused ClientTransportPlugin lines

Tor Browser includes several ClientTransportPlugin lines in its
torrc-defaults file, leading every Tor Browser user who looks at her
logs to see these notices and wonder if they're dangerous.

Resolves bug 13124; bugfix on 0.2.5.3-alpha.

11 years agoIn routerlist_assert_ok(), check r2 before taking &(r2->cache_info)
Nick Mathewson [Thu, 11 Sep 2014 03:46:20 +0000 (23:46 -0400)] 
In routerlist_assert_ok(), check r2 before taking &(r2->cache_info)

Technically, we're not allowed to take the address of a member can't
exist relative to the null pointer.  That makes me wonder how any sane
compliant system implements the offsetof macro, but let's let sleeping
balrogs lie.

Fixes 13096; patch on 0.1.1.9-alpha; patch from "teor", who was using
clang -fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv

11 years agoMerge remote-tracking branch 'public/bug12908_025' into maint-0.2.5
Nick Mathewson [Thu, 11 Sep 2014 02:12:47 +0000 (22:12 -0400)] 
Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5

11 years agoMerge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
Nick Mathewson [Tue, 9 Sep 2014 15:04:54 +0000 (11:04 -0400)] 
Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5

11 years agoMerge remote-tracking branch 'public/bug12700_024' into maint-0.2.5
Nick Mathewson [Tue, 9 Sep 2014 14:51:39 +0000 (10:51 -0400)] 
Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5

11 years agoClean up the MVSC nmake files so they work again.
Nick Mathewson [Tue, 9 Sep 2014 14:27:05 +0000 (10:27 -0400)] 
Clean up the MVSC nmake files so they work again.

Fixes bug 13081; bugfix on 0.2.5.1-alpha. Patch from "NewEraCracker."

11 years agoAdd more escaped() calls in directory.c
Nick Mathewson [Tue, 9 Sep 2014 14:22:01 +0000 (10:22 -0400)] 
Add more escaped() calls in directory.c

Patch from teor to fix 13071.

11 years agoExpand the event_mask field in controller conns to 64 bits
Nick Mathewson [Mon, 8 Sep 2014 19:15:05 +0000 (15:15 -0400)] 
Expand the event_mask field in controller conns to 64 bits

Back in 078d6bcd, we added an event number 0x20, but we didn't make
the event_mask field big enough to compensate.

Patch by "teor". Fixes 13085; bugfix on 0.2.5.1-alpha.

11 years agoAdd cscope generated files to .gitignore.
Nick Mathewson [Mon, 8 Sep 2014 19:07:54 +0000 (15:07 -0400)] 
Add cscope generated files to .gitignore.

Closes #13092; patch from dgoulet.

11 years agoCorrectly update channel local mark when address of incoming connection changes after...
Andrea Shepard [Fri, 5 Sep 2014 18:08:46 +0000 (11:08 -0700)] 
Correctly update channel local mark when address of incoming connection changes after handshake; fixes bug #12160

11 years agoDocumenting reject6 and accept6 ExitPolicy entries in manpage.
rl1987 [Sun, 31 Aug 2014 11:09:06 +0000 (14:09 +0300)] 
Documenting reject6 and accept6 ExitPolicy entries in manpage.

11 years agoFix a number of clang analyzer false-positives
Nick Mathewson [Tue, 2 Sep 2014 15:55:53 +0000 (11:55 -0400)] 
Fix a number of clang analyzer false-positives

Most of these are in somewhat non-obvious code where it is probably
a good idea to initialize variables and add extra assertions anyway.

Closes 13036.  Patches from "teor".

11 years agoAdding changes file.
rl1987 [Sun, 31 Aug 2014 11:35:30 +0000 (14:35 +0300)] 
Adding changes file.

11 years agoMerge remote-tracking branch 'arma/bug12996b' into maint-0.2.5
Nick Mathewson [Fri, 29 Aug 2014 20:44:50 +0000 (16:44 -0400)] 
Merge remote-tracking branch 'arma/bug12996b' into maint-0.2.5

11 years agoDowngrade "Unexpected onionskin length after decryption" warning
Roger Dingledine [Fri, 29 Aug 2014 20:38:54 +0000 (16:38 -0400)] 
Downgrade "Unexpected onionskin length after decryption" warning

It's now a protocol-warn, since there's nothing relay operators can
do about a client that sends them a malformed create cell.

Resolves bug 12996; bugfix on 0.0.6rc1.

11 years agoImprove "Tried to establish rendezvous on non-OR or non-edge circuit"
Nick Mathewson [Fri, 29 Aug 2014 20:05:58 +0000 (16:05 -0400)] 
Improve "Tried to establish rendezvous on non-OR or non-edge circuit"

Instead of putting it all in one warning message, log what exactly
was wrong with the circuit.

Resolves ticket 12997.

11 years agoResume expanding abbreviations for command-line options
Roger Dingledine [Wed, 27 Aug 2014 10:10:35 +0000 (06:10 -0400)] 
Resume expanding abbreviations for command-line options

The fix for bug 4647 accidentally removed our hack from bug 586 that
rewrote HashedControlPassword to __HashedControlSessionPassword when
it appears on the commandline (which allowed the user to set her own
HashedControlPassword in the torrc file while the controller generates
a fresh session password for each run).

Fixes bug 12948; bugfix on 0.2.5.1-alpha.

11 years agoWarn if Tor is a relay and a HS
Sathyanarayanan Gunasekaran [Tue, 22 Jul 2014 04:16:58 +0000 (21:16 -0700)] 
Warn if Tor is a relay and a HS

Closes 12908; see #8742

11 years agoFix relay_command_to_string(); solve 12700.
Nick Mathewson [Mon, 18 Aug 2014 17:19:43 +0000 (13:19 -0400)] 
Fix relay_command_to_string(); solve 12700.

Two bugs here:
  1) We didn't add EXTEND2/EXTENDED2 to relay_command_to_string().

  2) relay_command_to_string() didn't log the value of unrecognized
     commands.

Both fixed here.

11 years agoFix windows warning introduced by 0808ed83f9cf312abe229
Nick Mathewson [Mon, 18 Aug 2014 14:19:05 +0000 (10:19 -0400)] 
Fix windows warning introduced by 0808ed83f9cf312abe229

This will fix the warning
   "/src/or/config.c:6854:48: error: unused parameter 'group_readable'"
that I introduced while fixing 12864.

Bug not in any released version of Tor.

11 years agoMerge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5
Nick Mathewson [Fri, 15 Aug 2014 21:40:13 +0000 (17:40 -0400)] 
Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5

11 years agoSome documentation fixes for #12864.
George Kadianakis [Fri, 15 Aug 2014 20:12:06 +0000 (23:12 +0300)] 
Some documentation fixes for #12864.

11 years agoRemove stale printfs from buffer/zlib_fin_at_chunk_end test
Nick Mathewson [Fri, 15 Aug 2014 13:34:10 +0000 (09:34 -0400)] 
Remove stale printfs from buffer/zlib_fin_at_chunk_end test

These got committed by mistake.

11 years agoDocumentation fix on arguments to CookieAuthFileGroupReadable
Nick Mathewson [Fri, 15 Aug 2014 12:32:54 +0000 (08:32 -0400)] 
Documentation fix on arguments to CookieAuthFileGroupReadable

We don't actually allow a group name, but the documentation implied
that we did.

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.