]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
13 years agoAdd a new family-specific syntax for tor_addr_parse_mask_ports
Nick Mathewson [Wed, 24 Oct 2012 16:33:18 +0000 (12:33 -0400)] 
Add a new family-specific syntax for tor_addr_parse_mask_ports

By default, "*" means "All IPv4 addresses" with
tor_addr_parse_mask_ports, so I won't break anything.  But if the new
EXTENDED_STAR flag is provided, then * means "any address", *4 means
"any IPv4 address" (that is, 0.0.0.0/0), and "*6" means "any IPv6
address" (that is, [::]/0).

This is going to let us have a syntax for specifying exit policies in
torrc that won't drive people mad.

Also, add a bunch of unit tests for tor_addr_parse_mask_ports to test
these new features, and to increase coverage.

13 years agoRefactor begin cell parsing into its own function, with tests.
Nick Mathewson [Mon, 22 Oct 2012 15:28:37 +0000 (11:28 -0400)] 
Refactor begin cell parsing into its own function, with tests.

Add 'flags' argument to begin cells, per proposal 208.

13 years agoRefactor client_dns_set_{reverse_,}addressmap() to take a circ
Nick Mathewson [Sun, 28 Oct 2012 21:13:37 +0000 (17:13 -0400)] 
Refactor client_dns_set_{reverse_,}addressmap() to take a circ

We'd like these functions to be circuit-relative so that we can
implement a per-circuit DNS cache and per-circuit DNS cache rules for
proposal 205 or its successors.  I'm doing this now, as a part of the
IPv6 exits code, since there are about to be a few more instances
of code using this.

13 years agoMove address map into its own file.
Nick Mathewson [Sun, 28 Oct 2012 20:13:58 +0000 (16:13 -0400)] 
Move address map into its own file.

13 years agoMerge branch 'bug7267' of ssh://git-rw.torproject.org/user/andrea/tor
Andrea Shepard [Wed, 14 Nov 2012 02:54:24 +0000 (18:54 -0800)] 
Merge branch 'bug7267' of ssh://git-rw.torproject.org/user/andrea/tor

13 years agoAdd comment explaining different channel close functions
Andrea Shepard [Wed, 14 Nov 2012 02:50:37 +0000 (18:50 -0800)] 
Add comment explaining different channel close functions

13 years agoMerge remote-tracking branch 'public/bug7059'
Nick Mathewson [Wed, 14 Nov 2012 02:50:07 +0000 (21:50 -0500)] 
Merge remote-tracking branch 'public/bug7059'

13 years agoActually distribute the geoip6 file.
Nick Mathewson [Wed, 14 Nov 2012 02:24:28 +0000 (21:24 -0500)] 
Actually distribute the geoip6 file.

Fixes a bug (with no ticket) on 0.2.4.6-alpha.

13 years agoAdd changes file for bug 7267
Andrea Shepard [Tue, 13 Nov 2012 21:46:36 +0000 (13:46 -0800)] 
Add changes file for bug 7267

13 years agoCall channel_mark_for_close() properly in hibernate_go_dormant()
Andrea Shepard [Tue, 13 Nov 2012 21:45:00 +0000 (13:45 -0800)] 
Call channel_mark_for_close() properly in hibernate_go_dormant()

13 years agobump to 0.2.4.6-alpha-dev
Roger Dingledine [Tue, 13 Nov 2012 06:46:59 +0000 (01:46 -0500)] 
bump to 0.2.4.6-alpha-dev

13 years agobump to 0.2.4.6-alpha tor-0.2.4.6-alpha
Roger Dingledine [Tue, 13 Nov 2012 05:00:33 +0000 (00:00 -0500)] 
bump to 0.2.4.6-alpha

13 years agofold in changes files
Roger Dingledine [Tue, 13 Nov 2012 04:51:47 +0000 (23:51 -0500)] 
fold in changes files

13 years agoMerge branch 'maint-0.2.3'
Roger Dingledine [Tue, 13 Nov 2012 04:49:37 +0000 (23:49 -0500)] 
Merge branch 'maint-0.2.3'

13 years agouse a more logical operator
Roger Dingledine [Tue, 13 Nov 2012 04:47:21 +0000 (23:47 -0500)] 
use a more logical operator

Fix a harmless bug when opting against publishing a relay descriptor
because DisableNetwork is set.

Fixes bug 7464; bugfix on 0.2.3.9-alpha.

13 years agoPossible fix for bug 7212
Nick Mathewson [Mon, 12 Nov 2012 03:20:59 +0000 (22:20 -0500)] 
Possible fix for bug 7212

This is the simplest possible workaround: make it safe to call
circuit_cell_queue_clear() on a non-attached circuit, and make it
safe-but-a-LD_BUG-warning to call update_circuit_on_cmux() on a
non-attached circuit.

 LocalWords:  unstage src Untracked

13 years agoMerge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org...
Andrea Shepard [Sat, 10 Nov 2012 11:24:41 +0000 (03:24 -0800)] 
Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org/user/andrea/tor

13 years agoAdd changes file for connection_mark_for_close()/connection_mark_and_flush() or_conne...
Andrea Shepard [Sat, 10 Nov 2012 10:38:40 +0000 (02:38 -0800)] 
Add changes file for connection_mark_for_close()/connection_mark_and_flush() or_connection_t checking

13 years agoMake everything in connection.c that uses connection_or_notify_error() also use conne...
Andrea Shepard [Fri, 9 Nov 2012 22:19:45 +0000 (14:19 -0800)] 
Make everything in connection.c that uses connection_or_notify_error() also use connection_mark_and_close_internal() to avoid spurious warnings

13 years agoCheck for orconns in connection_mark_for_close and connection_mark_and_flush, and...
Andrea Shepard [Fri, 9 Nov 2012 22:06:54 +0000 (14:06 -0800)] 
Check for orconns in connection_mark_for_close and connection_mark_and_flush, and pass the call through channel_close_for_error with a warning to avoid asserts

13 years agoFix a memory leak in handling errors on CERTS cells. bug 7422
Nick Mathewson [Fri, 9 Nov 2012 04:01:39 +0000 (23:01 -0500)] 
Fix a memory leak in handling errors on CERTS cells. bug 7422

13 years agoFix test.c compilation on mingw32.
Nick Mathewson [Fri, 9 Nov 2012 01:09:06 +0000 (20:09 -0500)] 
Fix test.c compilation on mingw32.

Looks like windows doesn't have an s6_addr32 in its in6_addr.

Bug not in any released version of Tor; bugfix on abb886014e1ee.

13 years agoMerge remote-tracking branch 'origin/maint-0.2.3'
Nick Mathewson [Fri, 9 Nov 2012 01:00:54 +0000 (20:00 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.3'

13 years agoTurn a memwipe in tor_process_handle_destroy() back to memset
Nick Mathewson [Fri, 9 Nov 2012 00:59:54 +0000 (19:59 -0500)] 
Turn a memwipe in tor_process_handle_destroy() back to memset

It broke linking on tor-resolve.c, and it's not actually sanitizing
anything sensitive.  Fix for bug 7420; bug not on ony released Tor.

13 years agoTurn some memset()s introduced in tor 0.2.4 into memwipe()s
Nick Mathewson [Thu, 8 Nov 2012 22:00:36 +0000 (17:00 -0500)] 
Turn some memset()s introduced in tor 0.2.4 into memwipe()s

13 years agoMerge remote-tracking branch 'origin/maint-0.2.3'
Nick Mathewson [Thu, 8 Nov 2012 21:48:04 +0000 (16:48 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.3'

Conflicts:
src/common/crypto.c
src/or/rendservice.c

13 years agoMerge branch 'bug7352_023_rebased' into maint-0.2.3
Nick Mathewson [Thu, 8 Nov 2012 21:45:46 +0000 (16:45 -0500)] 
Merge branch 'bug7352_023_rebased' into maint-0.2.3

13 years agoAdd and use and unlikely-to-be-eliminated memwipe()
Nick Mathewson [Wed, 7 Nov 2012 21:09:58 +0000 (16:09 -0500)] 
Add and use and unlikely-to-be-eliminated memwipe()

Apparently some compilers like to eliminate memset() operations on
data that's about to go out-of-scope.  I've gone with the safest
possible replacement, which might be a bit slow.  I don't think this
is critical path in any way that will affect performance, but if it
is, we can work on that in 0.2.4.

Fixes bug 7352.

13 years agoMerge branch 'bug7350' of ssh://git-rw.torproject.org/user/andrea/tor
Andrea Shepard [Wed, 7 Nov 2012 19:43:04 +0000 (11:43 -0800)] 
Merge branch 'bug7350' of ssh://git-rw.torproject.org/user/andrea/tor

13 years agoAdd changes file for bug7350
Andrea Shepard [Wed, 7 Nov 2012 19:39:49 +0000 (11:39 -0800)] 
Add changes file for bug7350

13 years agoDon't call channel_send_destroy() when closing a circuit on a closing channel
Andrea Shepard [Wed, 7 Nov 2012 01:58:59 +0000 (17:58 -0800)] 
Don't call channel_send_destroy() when closing a circuit on a closing channel

13 years agoCheck for closing channel in channel_send_destroy()
Andrea Shepard [Wed, 7 Nov 2012 01:52:14 +0000 (17:52 -0800)] 
Check for closing channel in channel_send_destroy()

13 years agoMerge branch 'bug7285'
Nick Mathewson [Tue, 6 Nov 2012 23:02:03 +0000 (18:02 -0500)] 
Merge branch 'bug7285'

13 years agoMerge branch 'bug7195'
Nick Mathewson [Tue, 6 Nov 2012 22:53:45 +0000 (17:53 -0500)] 
Merge branch 'bug7195'

13 years agoAdd warning message when a managed proxy dies during configuration.
George Kadianakis [Mon, 22 Oct 2012 23:51:31 +0000 (02:51 +0300)] 
Add warning message when a managed proxy dies during configuration.

13 years agoFix a stupid logic-error in warnings about low ports.
Nick Mathewson [Tue, 6 Nov 2012 22:15:39 +0000 (17:15 -0500)] 
Fix a stupid logic-error in warnings about low ports.

Instead of warning about low ports that are advertised, we should have
been warning about low ports that we're listening on.  Bug 7285, fix
on 0.2.3.9-alpha.

13 years agoAllow an optional $ in GETINFO ns/id/<identity>
Nick Mathewson [Mon, 5 Nov 2012 03:12:11 +0000 (22:12 -0500)] 
Allow an optional $ in GETINFO ns/id/<identity>

That's not where I'd want to put a $, but apparently the other
foo/id/<identity> things allow it, as does an arguably valid
interpretation of control-spec.txt.  So let's be consistent.

Fix for a piece of bug 7059.

13 years agoMerge remote-tracking branch 'asn/bug7292'
Nick Mathewson [Mon, 5 Nov 2012 02:54:19 +0000 (21:54 -0500)] 
Merge remote-tracking branch 'asn/bug7292'

13 years agoWhitespace fixes
Nick Mathewson [Mon, 5 Nov 2012 02:52:28 +0000 (21:52 -0500)] 
Whitespace fixes

13 years agoClean up nonsensical calling convention for config_load_geoip_file_
Nick Mathewson [Mon, 5 Nov 2012 02:51:02 +0000 (21:51 -0500)] 
Clean up nonsensical calling convention for config_load_geoip_file_

(How many "load a file" functions do you typically see where the
function frees the filename argument?)

13 years agoMerge remote-tracking branch 'linus/bug5053-bug5055'
Nick Mathewson [Mon, 5 Nov 2012 02:44:31 +0000 (21:44 -0500)] 
Merge remote-tracking branch 'linus/bug5053-bug5055'

Conflicts:
src/or/geoip.c

13 years agoAdd an SLIST_ENTRY definition back on non-win32
Nick Mathewson [Fri, 2 Nov 2012 23:38:21 +0000 (19:38 -0400)] 
Add an SLIST_ENTRY definition back on non-win32

Otherwise we break openbsd headers.

Fixes bug 7293; bug not on any released Tor.

13 years agoUse LOG_WARN instead of LOG_PROTOCOL_WARN when parsing transport lines.
George Kadianakis [Fri, 2 Nov 2012 21:48:53 +0000 (23:48 +0200)] 
Use LOG_WARN instead of LOG_PROTOCOL_WARN when parsing transport lines.

13 years agoAvoid c99 designated initializers in circuitmux_ewma.c
Nick Mathewson [Fri, 2 Nov 2012 17:14:39 +0000 (13:14 -0400)] 
Avoid c99 designated initializers in circuitmux_ewma.c

We still want to build on compilers w/o c99 support, such as
(notoriously, shamefully) MSVC.

So I'm commenting out the designated initializers in
circuitmux_ewma.c.  The alternative would have been to use some kind
of macros to use designated initializers only when they're
supported, but that's error-prone, and can lead to code having
different meanings under different compilers.

Bug 7286; fix on 0.2.4.4-alpha; spotted by Gisle Vanem.

13 years agoRename SLIST_ENTRY to TOR_SLIST_ENTRY to fix windows compilation
Nick Mathewson [Thu, 1 Nov 2012 21:40:27 +0000 (17:40 -0400)] 
Rename SLIST_ENTRY to TOR_SLIST_ENTRY to fix windows compilation

Apparently winnt.h defines a different SLIST_ENTRY of its own.

Bug not in any version of Tor.

13 years agoChange some comments to reflect the multitude of GeoIP databases.
Linus Nordberg [Wed, 31 Oct 2012 15:38:07 +0000 (16:38 +0100)] 
Change some comments to reflect the multitude of GeoIP databases.

13 years agoFix whitespace
Nick Mathewson [Wed, 31 Oct 2012 15:27:13 +0000 (11:27 -0400)] 
Fix whitespace

13 years agoDon't memcmp struct in6_addr but rather its s6_addr member.
Linus Nordberg [Wed, 31 Oct 2012 14:52:56 +0000 (15:52 +0100)] 
Don't memcmp struct in6_addr but rather its s6_addr member.

13 years agoDuplicate less code.
Linus Nordberg [Wed, 31 Oct 2012 12:58:55 +0000 (13:58 +0100)] 
Duplicate less code.

13 years agoAdd a copy of the queue(3) manpage to the git repository.
Nick Mathewson [Tue, 30 Oct 2012 23:16:07 +0000 (19:16 -0400)] 
Add a copy of the queue(3) manpage to the git repository.

See 7105

13 years agoMerge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/tor
Andrea Shepard [Tue, 30 Oct 2012 21:39:14 +0000 (14:39 -0700)] 
Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/tor

13 years agochanges file for bug 7235
Nick Mathewson [Sun, 28 Oct 2012 14:58:26 +0000 (10:58 -0400)] 
changes file for bug 7235

13 years agoFix undefined reference to libm functions linking tor-fw-helper
Anthony G. Basile [Sun, 28 Oct 2012 01:30:21 +0000 (21:30 -0400)] 
Fix undefined reference to libm functions linking tor-fw-helper

When configuring tor without upnp support, ie ./configure --disable-upnp,
tor-fw-helper fails to link with undefined references to `ceil' and
`log'.  This if fixed by linking to libm.

X-Gentoo-Bug: 435040
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=435040
Reported-by: Alexandre <alexandre.cortes@outlook.com>
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
13 years agoMerge remote-tracking branch 'asn/bug6832'
Nick Mathewson [Sat, 27 Oct 2012 20:48:05 +0000 (16:48 -0400)] 
Merge remote-tracking branch 'asn/bug6832'

13 years agobump to 0.2.4.5-alpha-dev
Roger Dingledine [Fri, 26 Oct 2012 06:32:44 +0000 (02:32 -0400)] 
bump to 0.2.4.5-alpha-dev

13 years agoforward-port the 0.2.3.24-rc changelog tor-0.2.4.5-alpha
Roger Dingledine [Fri, 26 Oct 2012 04:39:55 +0000 (00:39 -0400)] 
forward-port the 0.2.3.24-rc changelog

13 years agotouch-ups
Roger Dingledine [Fri, 26 Oct 2012 04:39:06 +0000 (00:39 -0400)] 
touch-ups

13 years agoOptimistically say 0.2.4.5-alpha is coming out today
Nick Mathewson [Thu, 25 Oct 2012 14:57:20 +0000 (10:57 -0400)] 
Optimistically say 0.2.4.5-alpha is coming out today

13 years agoBump the version number to 0.2.4.5-alpha
Nick Mathewson [Thu, 25 Oct 2012 14:44:14 +0000 (10:44 -0400)] 
Bump the version number to 0.2.4.5-alpha

(For real this time.  It turns out that 4 and 5 are different numbers.)

13 years agoBump version to 0.2.4.5-alpha
Nick Mathewson [Thu, 25 Oct 2012 14:33:17 +0000 (10:33 -0400)] 
Bump version to 0.2.4.5-alpha

13 years agoFold in changelog item; draft blurb for 0.2.4.5-alpha
Nick Mathewson [Thu, 25 Oct 2012 14:32:20 +0000 (10:32 -0400)] 
Fold in changelog item; draft blurb for 0.2.4.5-alpha

13 years agoMerge branch 'link_negotiation_assert_024'
Nick Mathewson [Thu, 25 Oct 2012 14:21:01 +0000 (10:21 -0400)] 
Merge branch 'link_negotiation_assert_024'

13 years agoMerge remote-tracking branch 'origin/maint-0.2.3'
Nick Mathewson [Thu, 25 Oct 2012 14:19:46 +0000 (10:19 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3'

(Using an -s ours merge for Not taking the CVE-2012-2250 fix from
maint-0.2.3; it would conflict.)

13 years agoStart an 0.2.4.5 changelog.
Nick Mathewson [Thu, 25 Oct 2012 14:13:34 +0000 (10:13 -0400)] 
Start an 0.2.4.5 changelog.

The items from 0.2.3.x are copy-and-pastd from current release-0.2.3
changelog; the others are folded in from changes/*.

13 years agoChange changes file and comment for 7189, for making it 0.2.4-only for now
Nick Mathewson [Thu, 25 Oct 2012 02:11:43 +0000 (22:11 -0400)] 
Change changes file and comment for 7189, for making it 0.2.4-only for now

13 years agoMerge remote-tracking branch 'public/bug7189_tentative'
Nick Mathewson [Thu, 25 Oct 2012 02:07:10 +0000 (22:07 -0400)] 
Merge remote-tracking branch 'public/bug7189_tentative'

13 years agoOnly disable TLS tickets when being/acting as a server.
Nick Mathewson [Thu, 25 Oct 2012 00:13:25 +0000 (20:13 -0400)] 
Only disable TLS tickets when being/acting as a server.

Fix for bug 7189.

13 years agoFix instructions for using Tor with gcov
Nick Mathewson [Wed, 24 Oct 2012 19:03:49 +0000 (15:03 -0400)] 
Fix instructions for using Tor with gcov

It seems as if our new build system broke gcov for me.  I've tried to
fix doc/HACKING to describe what I needed to do in order to make it
work again.

13 years agoFix a remotely triggerable assertion failure (CVE-2012-2250)
Nick Mathewson [Wed, 24 Oct 2012 03:04:35 +0000 (23:04 -0400)] 
Fix a remotely triggerable assertion failure (CVE-2012-2250)

If we completed the handshake for the v2 link protocol but wound up
negotiating the wong protocol version, we'd become so confused about
what part of the handshake we were in that we'd promptly die with an
assertion.

This is a fix for CVE-2012-2250; it's a bugfix on 0.2.3.6-alpha.
All servers running that version or later should really upgrade.

Bug and fix from "some guy from France."  I tweaked his code slightly
to make it log the IP of the offending node, and to forward-port it to
0.2.4.

13 years agoFix a remotely triggerable assertion failure (CVE-2012-2250)
Nick Mathewson [Wed, 24 Oct 2012 02:58:38 +0000 (22:58 -0400)] 
Fix a remotely triggerable assertion failure (CVE-2012-2250)

If we completed the handshake for the v2 link protocol but wound up
negotiating the wong protocol version, we'd become so confused about
what part of the handshake we were in that we'd promptly die with an
assertion.

This is a fix for CVE-2012-2250; it's a bugfix on 0.2.3.6-alpha.
All servers running that version or later should really upgrade.

Bug and fix from "some guy from France."  I tweaked his code slightly
to make it log the IP of the offending node.

13 years agoUse the same changes file for bug7191 as in 0.2.[23]
Nick Mathewson [Wed, 24 Oct 2012 01:52:43 +0000 (21:52 -0400)] 
Use the same changes file for bug7191 as in 0.2.[23]

13 years agoMerge remote-tracking branch 'andrea/bug7191_v2'
Nick Mathewson [Wed, 24 Oct 2012 01:51:38 +0000 (21:51 -0400)] 
Merge remote-tracking branch 'andrea/bug7191_v2'

13 years agoMerge remote-tracking branch 'origin/maint-0.2.3'
Nick Mathewson [Wed, 24 Oct 2012 01:50:43 +0000 (21:50 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3'

This is an "ours" merge; we want a separate fix for this bug (bug7191)
in master. Rather than catching the two failing cases, we need to make
them not fail.

13 years agoMake unit test for bug7191 work with new smartlist_new() name
Nick Mathewson [Wed, 24 Oct 2012 01:49:46 +0000 (21:49 -0400)] 
Make unit test for bug7191 work with new smartlist_new() name

13 years agoMerge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
Nick Mathewson [Wed, 24 Oct 2012 01:48:50 +0000 (21:48 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

13 years agoAdd some unit tests for smartlist_bsearch_idx() on short lists
Andrea Shepard [Tue, 23 Oct 2012 21:28:19 +0000 (14:28 -0700)] 
Add some unit tests for smartlist_bsearch_idx() on short lists

Conflicts:
src/test/test_containers.c

13 years agoAdd a changes file for bug 7191.
Nick Mathewson [Wed, 24 Oct 2012 01:31:42 +0000 (21:31 -0400)] 
Add a changes file for bug 7191.

13 years agoFix binary search on lists of 0 or 1 element.
Nick Mathewson [Tue, 23 Oct 2012 21:12:37 +0000 (17:12 -0400)] 
Fix binary search on lists of 0 or 1 element.

The implementation we added has a tendency to crash with lists of 0 or
one element.  That can happen if we get a consensus vote, v2
consensus, consensus, or geoip file with 0 or 1 element.  There's a
DOS opportunity there that authorities could exploit against one
another, and which an evil v2 authority could exploit against anything
downloading v2 directory information..

This fix is minimalistic: It just adds a special-case for 0- and
1-element lists.  For 0.2.4 (the current alpha series) we'll want a
better patch.

This is bug 7191; it's a fix on 0.2.0.10-alpha.

13 years agoAdd some unit tests for smartlist_bsearch_idx() on short lists
Andrea Shepard [Tue, 23 Oct 2012 21:28:19 +0000 (14:28 -0700)] 
Add some unit tests for smartlist_bsearch_idx() on short lists

13 years agoRewrite smartlist_bsearch_idx() to not be broken for lists of length zero or one...
Andrea Shepard [Tue, 23 Oct 2012 21:27:56 +0000 (14:27 -0700)] 
Rewrite smartlist_bsearch_idx() to not be broken for lists of length zero or one (fixes bug 7191)

13 years agoMerge branch 'maint-0.2.3'
Roger Dingledine [Tue, 23 Oct 2012 21:26:07 +0000 (17:26 -0400)] 
Merge branch 'maint-0.2.3'

13 years agoRoll enh6876 into Changelog for 0.2.4.4 alpha, which had the change but not the entry.
Nick Mathewson [Tue, 23 Oct 2012 21:23:48 +0000 (17:23 -0400)] 
Roll enh6876 into Changelog for 0.2.4.4 alpha, which had the change but not the entry.

13 years agoMerge remote-tracking branch 'linus/enh6876_changes_file'
Nick Mathewson [Tue, 23 Oct 2012 21:22:37 +0000 (17:22 -0400)] 
Merge remote-tracking branch 'linus/enh6876_changes_file'

13 years agoLet 0.2.3 clients exit to internal addresses if they want
Roger Dingledine [Mon, 22 Oct 2012 19:45:39 +0000 (15:45 -0400)] 
Let 0.2.3 clients exit to internal addresses if they want

Clients now consider the ClientRejectInternalAddresses config option
when using a microdescriptor consensus stanza to decide whether
an exit relay would allow exiting to an internal address. Fixes
bug 7190; bugfix on 0.2.3.1-alpha.

13 years agofix typo
Roger Dingledine [Tue, 23 Oct 2012 21:15:28 +0000 (17:15 -0400)] 
fix typo

13 years agoMerge remote-tracking branch 'origin/maint-0.2.3'
Nick Mathewson [Tue, 23 Oct 2012 20:28:34 +0000 (16:28 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3'

13 years agoFix parse_short_policy (bug 7192.)
Nick Mathewson [Mon, 22 Oct 2012 21:34:05 +0000 (17:34 -0400)] 
Fix parse_short_policy (bug 7192.)

Our implementation of parse_short_policy was screwed up: it would
ignore the last character of every short policy.  Obviously, that's
broken.

This patch fixes the busted behavior, and adds a bunch of unit tests
to make sure the rest of that function is okay.

Fixes bug 7192; fix on 0.2.3.1-alpha.

13 years agoadd a unit test to expose bug 7192
Roger Dingledine [Mon, 22 Oct 2012 21:09:43 +0000 (17:09 -0400)] 
add a unit test to expose bug 7192

13 years agoFix more madness from the split_circuitbuild merge
Nick Mathewson [Mon, 22 Oct 2012 18:36:30 +0000 (14:36 -0400)] 
Fix more madness from the split_circuitbuild merge

13 years agoKill extraneous x from 907db008ab0007f0a02
Nick Mathewson [Mon, 22 Oct 2012 18:28:37 +0000 (14:28 -0400)] 
Kill extraneous x from 907db008ab0007f0a02

Looks like clang doesn't complain about this kind of thing.

Spotted by Andrea.  Bug not in any released version.

13 years agoMerge branch 'split_circuitbuild'
Nick Mathewson [Mon, 22 Oct 2012 15:35:32 +0000 (11:35 -0400)] 
Merge branch 'split_circuitbuild'

Conflicts:
src/or/circuitbuild.c

There was a huge-looking conflict in circuitbuild.c, but the only
change that had been made to circuitbuild.c since I forked off the
split_circuitbuild branch was 17442560c44e8093f9a.  So I took the
split_circuitbuild version of the conflicting part, and manually
re-applied the change from 17442560c44e8093f9a..

13 years agoChanges files for tickets 5053 and 5055.
Linus Nordberg [Fri, 19 Oct 2012 21:23:04 +0000 (23:23 +0200)] 
Changes files for tickets 5053 and 5055.

13 years agoName variables more consistently.
Linus Nordberg [Fri, 19 Oct 2012 21:23:04 +0000 (23:23 +0200)] 
Name variables more consistently.

13 years agoDocument two functions.
Linus Nordberg [Fri, 19 Oct 2012 21:23:04 +0000 (23:23 +0200)] 
Document two functions.

13 years agoAdd changes file for ticket 6876 missing from 0.2.4.4-alpha ChangeLog.
Linus Nordberg [Fri, 19 Oct 2012 21:23:04 +0000 (23:23 +0200)] 
Add changes file for ticket 6876 missing from 0.2.4.4-alpha ChangeLog.

13 years agoPossessive "it's" → "its" in .nsi files.
David Fifield [Sun, 21 Oct 2012 07:06:02 +0000 (00:06 -0700)] 
Possessive "it's" → "its" in .nsi files.

13 years agobump to 0.2.4.4-alpha-dev
Roger Dingledine [Sun, 21 Oct 2012 17:25:35 +0000 (13:25 -0400)] 
bump to 0.2.4.4-alpha-dev

13 years agobump to 0.2.4.4-alpha tor-0.2.4.4-alpha
Roger Dingledine [Sat, 20 Oct 2012 20:06:05 +0000 (16:06 -0400)] 
bump to 0.2.4.4-alpha

13 years agofold in changes files for upcoming 0.2.4.4-alpha
Roger Dingledine [Sat, 20 Oct 2012 19:37:57 +0000 (15:37 -0400)] 
fold in changes files for upcoming 0.2.4.4-alpha

13 years agoRename C reserved identifiers missed before.
Linus Nordberg [Sat, 20 Oct 2012 16:43:50 +0000 (18:43 +0200)] 
Rename C reserved identifiers missed before.