]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
11 years agobump to 0.2.4.18-rc tor-0.2.4.18-rc
Roger Dingledine [Sat, 16 Nov 2013 18:12:13 +0000 (13:12 -0500)] 
bump to 0.2.4.18-rc

11 years agofold in more changes entries, clean up changelog
Roger Dingledine [Sat, 16 Nov 2013 18:07:58 +0000 (13:07 -0500)] 
fold in more changes entries, clean up changelog

11 years agoMerge branch 'maint-0.2.4' into release-0.2.4
Roger Dingledine [Fri, 15 Nov 2013 22:10:31 +0000 (17:10 -0500)] 
Merge branch 'maint-0.2.4' into release-0.2.4

11 years agostart to migrate recent changes
Roger Dingledine [Fri, 15 Nov 2013 22:08:45 +0000 (17:08 -0500)] 
start to migrate recent changes

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Fri, 15 Nov 2013 20:29:24 +0000 (15:29 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

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

Conflicts were simple to resolve.  More fixes were needed for
compilation, including: reinstating the tv_to_msec function, and renaming
*_conn_cells to *_chan_cells.

11 years agoMerge branch 'bug9093_023' into maint-0.2.3
Nick Mathewson [Fri, 15 Nov 2013 20:23:51 +0000 (15:23 -0500)] 
Merge branch 'bug9093_023' into maint-0.2.3

11 years agomissing changes file for #10124
Nick Mathewson [Mon, 11 Nov 2013 15:49:44 +0000 (10:49 -0500)] 
missing changes file for #10124

11 years agoMerge branch 'maint-0.2.4' into release-0.2.4
Roger Dingledine [Mon, 11 Nov 2013 02:51:31 +0000 (21:51 -0500)] 
Merge branch 'maint-0.2.4' into release-0.2.4

11 years agoFix two more DirServer mentions in log
Nick Mathewson [Sun, 10 Nov 2013 17:23:56 +0000 (12:23 -0500)] 
Fix two more DirServer mentions in log

11 years agoFix a wide line
Nick Mathewson [Sun, 10 Nov 2013 17:22:34 +0000 (12:22 -0500)] 
Fix a wide line

11 years agoChange documentation DirServer->DirAuthority
Nick Mathewson [Sun, 10 Nov 2013 17:21:23 +0000 (12:21 -0500)] 
Change documentation DirServer->DirAuthority

We renamed the option, but we didn't actually fix it in the log
messages or the docs.  This patch does that.

For #10124.  Patch by sqrt2.

11 years agoImproved circuit queue out-of-memory handler
Nick Mathewson [Thu, 7 Nov 2013 17:15:30 +0000 (12:15 -0500)] 
Improved circuit queue out-of-memory handler

Previously, when we ran low on memory, we'd close whichever circuits
had the most queued cells. Now, we close those that have the
*oldest* queued cells, on the theory that those are most responsible
for us running low on memory, and that those are the least likely to
actually drain on their own if we wait a little longer.

Based on analysis from a forthcoming paper by Jansen, Tschorsch,
Johnson, and Scheuermann. Fixes bug 9093.

12 years agoMerge branch 'maint-0.2.4' into release-0.2.4
Roger Dingledine [Sat, 2 Nov 2013 10:35:46 +0000 (06:35 -0400)] 
Merge branch 'maint-0.2.4' into release-0.2.4

12 years agoMerge remote-tracking branch 'public/bug9645' into maint-0.2.4
Nick Mathewson [Thu, 31 Oct 2013 20:09:41 +0000 (16:09 -0400)] 
Merge remote-tracking branch 'public/bug9645' into maint-0.2.4

12 years agoMerge remote-tracking branch 'public/bug9731b' into maint-0.2.4
Nick Mathewson [Thu, 31 Oct 2013 18:08:28 +0000 (14:08 -0400)] 
Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4

12 years agoMerge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4
Nick Mathewson [Thu, 31 Oct 2013 18:02:28 +0000 (14:02 -0400)] 
Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4

12 years agoMerge remote-tracking branch 'public/bug6055_v2_024' into maint-0.2.4
Nick Mathewson [Thu, 31 Oct 2013 17:14:39 +0000 (13:14 -0400)] 
Merge remote-tracking branch 'public/bug6055_v2_024' into maint-0.2.4

12 years agofold in changes entries
Roger Dingledine [Thu, 17 Oct 2013 06:51:06 +0000 (02:51 -0400)] 
fold in changes entries

12 years agoMerge branch 'maint-0.2.4' into release-0.2.4
Roger Dingledine [Wed, 16 Oct 2013 22:51:15 +0000 (18:51 -0400)] 
Merge branch 'maint-0.2.4' into release-0.2.4

12 years agobe willing to bootstrap from all three of our directory guards
Roger Dingledine [Fri, 11 Oct 2013 00:09:16 +0000 (20:09 -0400)] 
be willing to bootstrap from all three of our directory guards

Also fix a bug where if the guard we choose first doesn't answer, we
would try the second guard, but once we connected to the second guard
we would abandon it and retry the first one, slowing down bootstrapping.

The fix in both cases is to treat all our initially chosen guards as
acceptable to use.

Fixes bug 9946.

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Fri, 11 Oct 2013 15:16:59 +0000 (11:16 -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 [Fri, 11 Oct 2013 15:16:45 +0000 (11:16 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

12 years agoUpdate to the October 2013 GeoIP database. maint-0.2.2
Karsten Loesing [Fri, 11 Oct 2013 11:36:30 +0000 (13:36 +0200)] 
Update to the October 2013 GeoIP database.

12 years agoin-progress release notes for the upcoming 0.2.4 stable
Roger Dingledine [Fri, 11 Oct 2013 01:43:50 +0000 (21:43 -0400)] 
in-progress release notes for the upcoming 0.2.4 stable

12 years agoMerge branch 'maint-0.2.4' into release-0.2.4
Roger Dingledine [Fri, 11 Oct 2013 01:42:33 +0000 (21:42 -0400)] 
Merge branch 'maint-0.2.4' into release-0.2.4

12 years agorewrite history to improve two changelog entries
Roger Dingledine [Fri, 11 Oct 2013 01:17:19 +0000 (21:17 -0400)] 
rewrite history to improve two changelog entries

12 years agoMerge branch 'bug9644_024' into maint-0.2.4
Nick Mathewson [Thu, 10 Oct 2013 15:23:46 +0000 (11:23 -0400)] 
Merge branch 'bug9644_024' into maint-0.2.4

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Thu, 10 Oct 2013 15:18:07 +0000 (11:18 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

12 years agoFix unit test for format_helper_exit_status
Nick Mathewson [Thu, 10 Oct 2013 15:15:35 +0000 (11:15 -0400)] 
Fix unit test for format_helper_exit_status

Fix format_helper_exit_status to allow full HEX_ERRNO_SIZE answers,
*and* increase the buffer length again.

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Thu, 10 Oct 2013 14:55:24 +0000 (10:55 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

12 years agoMerge remote-tracking branch 'public/bug9928' into maint-0.2.3
Nick Mathewson [Thu, 10 Oct 2013 14:53:27 +0000 (10:53 -0400)] 
Merge remote-tracking branch 'public/bug9928' into maint-0.2.3

12 years agoPartially revert "Clarify who learns about ContactInfo."
Nick Mathewson [Wed, 9 Oct 2013 16:02:53 +0000 (12:02 -0400)] 
Partially revert "Clarify who learns about ContactInfo."

This reverts the torrc.sample.in changes from commit
66a04a6ac334775dc396025e0c15fa49eca138a7.

We're going to not make this change in 0.2.4, since changing
torrc.sample.in makes all the debian users do some pointless
busywork. see tor-dev discusion of 9 Oct 2013.

12 years agoChanges file for 9854
Nick Mathewson [Wed, 9 Oct 2013 13:43:54 +0000 (09:43 -0400)] 
Changes file for 9854

12 years agoClarify who learns about ContactInfo.
Karsten Loesing [Wed, 9 Oct 2013 10:01:45 +0000 (12:01 +0200)] 
Clarify who learns about ContactInfo.

Explicitly include bridges, and note that we archive and publish all
descriptors.

(We are not yet publishing ContactInfo lines contained in bridge
descriptors, but maybe we'll want to do that soon, so let's err on the
side of caution here.)

Related to #9854.

12 years agoWhen examining interfaces to find an address, discard non-up ones.
Nick Mathewson [Tue, 8 Oct 2013 20:46:29 +0000 (16:46 -0400)] 
When examining interfaces to find an address, discard non-up ones.

Patch from "hantwister" on trac. Fixes bug #9904; bugfix on
0.2.3.11-alpha.

12 years agoSwitch ECDHE group default logic for bridge/relay TLS
Nick Mathewson [Thu, 19 Sep 2013 14:40:41 +0000 (10:40 -0400)] 
Switch ECDHE group default logic for bridge/relay TLS

According to the manpage, bridges use P256 for conformity and relays
use P224 for speed. But skruffy points out that we've gotten it
backwards in the code.

In this patch, we make the default P256 for everybody.

Fixes bug 9780; bugfix on 0.2.4.8-alpha.

12 years agoChanges file for 9866
Nick Mathewson [Mon, 7 Oct 2013 15:32:06 +0000 (11:32 -0400)] 
Changes file for 9866

12 years agoAnchors for options (re#9866)
Peter Palfrader [Wed, 2 Oct 2013 20:27:27 +0000 (22:27 +0200)] 
Anchors for options (re#9866)

12 years agoMerge remote-tracking branch 'public/bug9927' into maint-0.2.4
Nick Mathewson [Tue, 8 Oct 2013 17:37:13 +0000 (13:37 -0400)] 
Merge remote-tracking branch 'public/bug9927' into maint-0.2.4

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Tue, 8 Oct 2013 16:16:42 +0000 (12:16 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

12 years agoMerge remote-tracking branch 'public/bug9596' into maint-0.2.4
Nick Mathewson [Tue, 8 Oct 2013 16:10:47 +0000 (12:10 -0400)] 
Merge remote-tracking branch 'public/bug9596' into maint-0.2.4

12 years agoGive credit to bug reporter for 9928
Nick Mathewson [Tue, 8 Oct 2013 16:06:06 +0000 (12:06 -0400)] 
Give credit to bug reporter for 9928

12 years agoGenerate bootstrapping status messages for microdescs too
Nick Mathewson [Tue, 8 Oct 2013 15:31:08 +0000 (11:31 -0400)] 
Generate bootstrapping status messages for microdescs too

Fix for 9927.

12 years agoRaise buffer size, fix checks for format_exit_helper_status.
Nick Mathewson [Tue, 8 Oct 2013 15:13:21 +0000 (11:13 -0400)] 
Raise buffer size, fix checks for format_exit_helper_status.

This is probably not an exploitable bug, since you would need to have
errno be a large negative value in the unix pluggable-transport launcher
case.  Still, best avoided.

Fixes bug 9928; bugfix on 0.2.3.18-rc.

12 years agoMerge branch 'bug9880_fix' into maint-0.2.4
Nick Mathewson [Thu, 3 Oct 2013 02:39:27 +0000 (22:39 -0400)] 
Merge branch 'bug9880_fix' into maint-0.2.4

12 years agoFix a bug in our bug 9776 fix.
Nick Mathewson [Thu, 3 Oct 2013 01:42:24 +0000 (21:42 -0400)] 
Fix a bug in our bug 9776 fix.

By calling circuit_n_chan_done() unconditionally on close, we were
closing pending connections that might not have been pending quite for
the connection we were closing.  Fix for bug 9880.

Thanks to skruffy for finding this and explaining it patiently until
we understood.

12 years agofold in changes entries
Roger Dingledine [Mon, 30 Sep 2013 04:55:01 +0000 (00:55 -0400)] 
fold in changes entries

12 years agoMerge branch 'maint-0.2.4' into release-0.2.4
Roger Dingledine [Mon, 30 Sep 2013 04:46:57 +0000 (00:46 -0400)] 
Merge branch 'maint-0.2.4' into release-0.2.4

12 years agoRe-enable TLS 1.[12] when building with OpenSSL >= 1.0.1e
Nick Mathewson [Wed, 14 Aug 2013 03:43:39 +0000 (23:43 -0400)] 
Re-enable TLS 1.[12] when building with OpenSSL >= 1.0.1e

To fix #6033, we disabled TLS 1.1 and 1.2.  Eventually, OpenSSL fixed
the bug behind #6033.

I've considered alternate implementations that do more testing to see
if there's secretly an OpenSSL 1.0.1c or something that secretly has a
backport of the OpenSSL 1.0.1e fix, and decided against it on the
grounds of complexity.

12 years agoAlways call circuit_n_chan_done(chan, 0) from channel_closed()
Andrea Shepard [Mon, 23 Sep 2013 16:37:26 +0000 (09:37 -0700)] 
Always call circuit_n_chan_done(chan, 0) from channel_closed()

12 years agoFix a compilation warning with older gcc
Nick Mathewson [Mon, 23 Sep 2013 05:47:52 +0000 (01:47 -0400)] 
Fix a compilation warning with older gcc

12 years agoRelays should send timestamp in NETINFO.
Nick Mathewson [Sat, 21 Sep 2013 12:52:27 +0000 (08:52 -0400)] 
Relays should send timestamp in NETINFO.

This avoids skew warnings as authorities test reachability.

Fix 9798; fix not on any released Tor.

12 years agoback out most of 1d0ba9a
Roger Dingledine [Sat, 21 Sep 2013 06:11:51 +0000 (02:11 -0400)] 
back out most of 1d0ba9a

this was causing directory authorities to send a time of 0 on all
connections they generated themselves, which means everybody reachability
test caused a time skew warning in the log for that relay.

(i didn't just revert, because the changes file has been modified by
other later commits.)

12 years agoMerge branch 'no_client_timestamps_024_v2' into maint-0.2.4
Nick Mathewson [Fri, 20 Sep 2013 15:00:43 +0000 (11:00 -0400)] 
Merge branch 'no_client_timestamps_024_v2' into maint-0.2.4

12 years agoAvoid error by not saying which intro cell type I mean
Nick Mathewson [Fri, 20 Sep 2013 15:00:04 +0000 (11:00 -0400)] 
Avoid error by not saying which intro cell type I mean

12 years agoRound down hidden service descriptor publication times to nearest hour
Nick Mathewson [Wed, 18 Sep 2013 15:09:34 +0000 (11:09 -0400)] 
Round down hidden service descriptor publication times to nearest hour

Implements part of proposal 222.  We can do this safely, since
REND_CACHE_MAX_SKEW is 24 hours.

12 years agoRemove the timestamp from AUTHENTICATE cells; replace with random bytes
Nick Mathewson [Wed, 18 Sep 2013 14:51:04 +0000 (10:51 -0400)] 
Remove the timestamp from AUTHENTICATE cells; replace with random bytes

This isn't actually much of an issue, since only relays send
AUTHENTICATE cells, but while we're removing timestamps, we might as
well do this too.

Part of proposal 222.  I didn't take the approach in the proposal of
using a time-based HMAC, since that was a bad-prng-mitigation hack
from SSL3, and in real life, if you don't have a good RNG, you're
hopeless as a Tor server.

12 years agoGet ready to stop sending timestamps in INTRODUCE cells
Nick Mathewson [Tue, 17 Sep 2013 22:05:48 +0000 (18:05 -0400)] 
Get ready to stop sending timestamps in INTRODUCE cells

For now, round down to the nearest 10 minutes.  Later, eliminate entirely by
setting a consensus parameter.

(This rounding is safe because, in 0.2.2, where the timestamp mattered,
REND_REPLAY_TIME_INTERVAL was a nice generous 60 minutes.)

12 years agoStop sending the current time in client NETINFO handshakes.
Nick Mathewson [Tue, 17 Sep 2013 21:55:43 +0000 (17:55 -0400)] 
Stop sending the current time in client NETINFO handshakes.

Implements part of proposal 222.

12 years agoWhen freeing a cert_list_t, avoid memory leak.
Nick Mathewson [Thu, 19 Sep 2013 16:22:49 +0000 (12:22 -0400)] 
When freeing a cert_list_t, avoid memory leak.

We were freeing these on exit, but when we added the dl_status_map
field to them in fddb814f, we forgot to arrange for it to be freed.

I've moved the cert_list_free() code into its own function, and added
an appropriate dsmap_free() call.

Fixes bug 9644; bugfix on 0.2.4.13-alpha.

12 years agoDocument that disabledebuggerattachment prevents cores
Nick Mathewson [Thu, 19 Sep 2013 16:14:07 +0000 (12:14 -0400)] 
Document that disabledebuggerattachment prevents cores

12 years agoFix an assert when disabling ORPort with accounting disabled.
Nick Mathewson [Wed, 18 Sep 2013 14:26:32 +0000 (10:26 -0400)] 
Fix an assert when disabling ORPort with accounting disabled.

The problem was that the server_identity_key_is_set() function could
return true under conditions where we don't really have an identity
key -- specifically, where we used to have one, but we stopped being a
server.

This is a fix for 6979; bugfix on 0.2.2.18-alpha where we added that
assertion to get_server_identity_key().

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Mon, 16 Sep 2013 16:47:05 +0000 (12:47 -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, 16 Sep 2013 16:46:50 +0000 (12:46 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

12 years agoDon't apply read/write buckets to cpuworker connections
Nick Mathewson [Fri, 13 Sep 2013 17:37:53 +0000 (13:37 -0400)] 
Don't apply read/write buckets to cpuworker connections

Fixes bug 9731

12 years agoUpdate to the September 2013 GeoIP database.
Karsten Loesing [Tue, 10 Sep 2013 13:00:06 +0000 (15:00 +0200)] 
Update to the September 2013 GeoIP database.

12 years agogive it a blurb and touch up the changelog stanzas tor-0.2.4.17-rc
Roger Dingledine [Thu, 5 Sep 2013 06:32:02 +0000 (02:32 -0400)] 
give it a blurb and touch up the changelog stanzas

12 years agobump to 0.2.4.17-rc
Roger Dingledine [Thu, 5 Sep 2013 05:50:14 +0000 (01:50 -0400)] 
bump to 0.2.4.17-rc

12 years agofold in another changes item
Roger Dingledine [Thu, 5 Sep 2013 05:48:18 +0000 (01:48 -0400)] 
fold in another changes item

12 years agoMerge branch 'maint-0.2.4' into release-0.2.4
Roger Dingledine [Thu, 5 Sep 2013 05:47:47 +0000 (01:47 -0400)] 
Merge branch 'maint-0.2.4' into release-0.2.4

12 years agocollect and log statistics about onionskins received/processed
Roger Dingledine [Wed, 4 Sep 2013 21:43:15 +0000 (17:43 -0400)] 
collect and log statistics about onionskins received/processed

we skip onionskins that came from non-relays, so we're less likely to
run into privacy troubles.

starts to implement ticket 9658.

12 years agoRevert e443beff and solve it a different way
Roger Dingledine [Thu, 5 Sep 2013 05:41:07 +0000 (01:41 -0400)] 
Revert e443beff and solve it a different way

Now we explicitly check for overflow.

This approach seemed smarter than a cascade of "change int to unsigned
int and hope nothing breaks right before the release".

Nick, feel free to fix in a better way, maybe in master.

12 years agodon't let recently_chosen_ntors overflow
Roger Dingledine [Thu, 5 Sep 2013 05:27:46 +0000 (01:27 -0400)] 
don't let recently_chosen_ntors overflow

with commit c6f1668d we let it grow arbitrarily large.

it can still overflow, but the damage is very small now.

12 years agofold in recent changes entries
Roger Dingledine [Thu, 5 Sep 2013 03:57:35 +0000 (23:57 -0400)] 
fold in recent changes entries

12 years agoMerge branch 'maint-0.2.4' into release-0.2.4
Roger Dingledine [Thu, 5 Sep 2013 03:46:46 +0000 (23:46 -0400)] 
Merge branch 'maint-0.2.4' into release-0.2.4

12 years agonickm wants us to prioritize tap in a currently-rare edge case
Roger Dingledine [Wed, 4 Sep 2013 23:43:46 +0000 (19:43 -0400)] 
nickm wants us to prioritize tap in a currently-rare edge case

12 years agoadd a changes entry for ticket 9574
Roger Dingledine [Wed, 4 Sep 2013 06:10:30 +0000 (02:10 -0400)] 
add a changes entry for ticket 9574

12 years agoBe more general in calculating expected onion queue processing time
Roger Dingledine [Wed, 4 Sep 2013 02:15:33 +0000 (22:15 -0400)] 
Be more general in calculating expected onion queue processing time

Now we consider the TAP cells we'll process while draining the NTor
queue, and vice versa.

12 years agolet the NumNTorsPerTAP consensus param override our queue choice
Roger Dingledine [Wed, 4 Sep 2013 00:58:15 +0000 (20:58 -0400)] 
let the NumNTorsPerTAP consensus param override our queue choice

12 years agodo a lopsided round-robin between the onion queues
Roger Dingledine [Wed, 4 Sep 2013 00:40:16 +0000 (20:40 -0400)] 
do a lopsided round-robin between the onion queues

that way tap won't starve entirely, but we'll still handle ntor requests
quicker.

12 years agocheck bounds on handshake_type more thoroughly
Roger Dingledine [Tue, 3 Sep 2013 22:48:16 +0000 (18:48 -0400)] 
check bounds on handshake_type more thoroughly

12 years agoadd info-level logs to help track onion queue sizes
Roger Dingledine [Sun, 1 Sep 2013 20:51:27 +0000 (16:51 -0400)] 
add info-level logs to help track onion queue sizes

12 years agorefactor and give it unit tests
Roger Dingledine [Sun, 1 Sep 2013 08:40:05 +0000 (04:40 -0400)] 
refactor and give it unit tests

12 years agoSeparate cpuworker queues by handshake type
Roger Dingledine [Sun, 1 Sep 2013 03:35:58 +0000 (23:35 -0400)] 
Separate cpuworker queues by handshake type

Now we prioritize ntor create cells over tap create cells.

Starts to address ticket 9574.

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Wed, 4 Sep 2013 20:08:02 +0000 (16:08 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts:
src/or/circuitbuild.c

12 years agoMerge branch 'bug9671_023' into maint-0.2.3
Nick Mathewson [Wed, 4 Sep 2013 20:04:47 +0000 (16:04 -0400)] 
Merge branch 'bug9671_023' into maint-0.2.3

12 years agouse !cbt_disabled in place of LearnCBT to avoid needless circs
Nick Mathewson [Wed, 4 Sep 2013 19:51:13 +0000 (15:51 -0400)] 
use !cbt_disabled in place of LearnCBT to avoid needless circs

This would make us do testing circuits "even when cbt is disabled by
consensus, or when we're a directory authority, or when we've failed
to write cbt history to our state file lately." (Roger's words.)

This is a fix for 9671 and an improvement in our fix for 5049.
The original misbehavior was in 0.2.2.14-alpha; the incomplete
fix was in 0.2.3.17-beta.

12 years agoMerge branch 'bug9400_024_squashed' into maint-0.2.4
Nick Mathewson [Tue, 3 Sep 2013 19:38:54 +0000 (15:38 -0400)] 
Merge branch 'bug9400_024_squashed' into maint-0.2.4

12 years agoAvoid a double-close on one failing case of the socketpair replacement code
Nick Mathewson [Tue, 6 Aug 2013 20:41:57 +0000 (16:41 -0400)] 
Avoid a double-close on one failing case of the socketpair replacement code

Fix for bug 9400, spotted by coverity. Bug introduced in revision 2cb4f7a4
(subversion revision r389).

12 years agoFix bug 9645: don't forget an md just because we can't save it.
Nick Mathewson [Tue, 3 Sep 2013 18:25:01 +0000 (14:25 -0400)] 
Fix bug 9645: don't forget an md just because we can't save it.

12 years agofold in changes entries
Roger Dingledine [Sun, 1 Sep 2013 00:30:28 +0000 (20:30 -0400)] 
fold in changes entries

12 years agoMerge branch 'maint-0.2.4' into release-0.2.4
Roger Dingledine [Sun, 1 Sep 2013 00:10:58 +0000 (20:10 -0400)] 
Merge branch 'maint-0.2.4' into release-0.2.4

12 years agoIncrease POLICY_BUF_LEN to 72 to accomodate IPv6 exit policy items.
Nick Mathewson [Mon, 26 Aug 2013 15:30:09 +0000 (11:30 -0400)] 
Increase POLICY_BUF_LEN to 72 to accomodate IPv6 exit policy items.

Fixes bug 9596; bugfix on 0.2.4.7-alpha.

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Sun, 25 Aug 2013 04:33:10 +0000 (00:33 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

(Using "ours" strategy to avoid taking 9546 fix in 0.2.3; we just
merged our own into 0.2.4)

12 years agoMerge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3
Nick Mathewson [Sun, 25 Aug 2013 04:32:27 +0000 (00:32 -0400)] 
Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3

12 years agoMerge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4
Nick Mathewson [Sun, 25 Aug 2013 04:31:51 +0000 (00:31 -0400)] 
Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4

12 years agoMerge remote-tracking branch 'public/bug9366' into maint-0.2.4
Nick Mathewson [Sun, 25 Aug 2013 04:29:49 +0000 (00:29 -0400)] 
Merge remote-tracking branch 'public/bug9366' into maint-0.2.4

12 years agoMerge remote-tracking branch 'public/bug9543' into maint-0.2.4
Nick Mathewson [Sun, 25 Aug 2013 04:29:06 +0000 (00:29 -0400)] 
Merge remote-tracking branch 'public/bug9543' into maint-0.2.4

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Fri, 23 Aug 2013 00:47:10 +0000 (20:47 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

12 years agoMerge remote-tracking branch 'public/bug9564' into maint-0.2.3
Nick Mathewson [Fri, 23 Aug 2013 00:46:40 +0000 (20:46 -0400)] 
Merge remote-tracking branch 'public/bug9564' into maint-0.2.3