]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
9 years agoFix broken directory request to the DirPort
David Goulet [Thu, 24 Mar 2016 17:57:53 +0000 (13:57 -0400)] 
Fix broken directory request to the DirPort

Commit e72cbf7a4 introduced a change to directory_initiate_command_rend()
that made tor use the ORPort when making a directory request to the DirPort.
The primary consequence was that a relay couldn't selftest its DirPort thus
failing to work and join the network properly.

The main issue was we were always considering an anonymized connection to be
an OR connection which is not true.

Fixes #18623

Signed-off-by: David Goulet <dgoulet@ev0ke.net>
9 years agoMerge branch 'bug18517_squashed'
Nick Mathewson [Thu, 24 Mar 2016 14:14:05 +0000 (10:14 -0400)] 
Merge branch 'bug18517_squashed'

9 years agoAlways allow OR connections to bridges on private addresses
teor (Tim Wilson-Brown) [Wed, 23 Mar 2016 02:37:35 +0000 (13:37 +1100)] 
Always allow OR connections to bridges on private addresses

Regardless of the setting of ExtendAllowPrivateAddresses.

This fixes a bug with pluggable transports that ignore the
(potentially private) address in their bridge line.

Fixes bug 18517; bugfix on 23b088907f in tor-0.2.8.1-alpha.

9 years agoMerge remote-tracking branch 'teor/bug18351'
Nick Mathewson [Thu, 24 Mar 2016 13:33:58 +0000 (09:33 -0400)] 
Merge remote-tracking branch 'teor/bug18351'

9 years agoMerge remote-tracking branch 'teor/bug18489'
Nick Mathewson [Thu, 24 Mar 2016 13:01:28 +0000 (09:01 -0400)] 
Merge remote-tracking branch 'teor/bug18489'

9 years agoCheck if fallbacks support extrainfo descriptors before requesting them
teor (Tim Wilson-Brown) [Thu, 24 Mar 2016 11:03:58 +0000 (22:03 +1100)] 
Check if fallbacks support extrainfo descriptors before requesting them

When requesting extrainfo descriptors from a trusted directory
server, check whether it is an authority or a fallback directory
which supports extrainfo descriptors.

Fixes bug 18489; bugfix on 90f6071d8d in tor-0.2.4.7-alpha.

Reported by "atagar", patch by "teor".

9 years agoCode indentation whitespace-only fix
teor (Tim Wilson-Brown) [Thu, 24 Mar 2016 10:56:13 +0000 (21:56 +1100)] 
Code indentation whitespace-only fix

9 years agoClarify ReachableAddress log messages
teor (Tim Wilson-Brown) [Thu, 24 Mar 2016 09:59:49 +0000 (20:59 +1100)] 
Clarify ReachableAddress log messages

Make it clearer that they are about outgoing connection attempts.
Specify the options involved where they were missing from one log
message.
Clarify a comment.

9 years agoDowngrade IP version warnings to avoid filling logs
teor (Tim Wilson-Brown) [Wed, 23 Mar 2016 23:38:07 +0000 (10:38 +1100)] 
Downgrade IP version warnings to avoid filling logs

Downgrade logs and backtraces about IP versions to
info-level. Only log backtraces once each time tor runs.

Assists in diagnosing bug 18351; bugfix on c3cc8e16e in
tor-0.2.8.1-alpha.

Reported by "sysrqb" and "Christian", patch by "teor".

9 years agospecify in the man page that {cc} is a 2-letter ISA3166 code
Roger Dingledine [Wed, 23 Mar 2016 21:49:55 +0000 (17:49 -0400)] 
specify in the man page that {cc} is a 2-letter ISA3166 code

9 years agoOkay fine maybe it's an alpha.
Nick Mathewson [Wed, 23 Mar 2016 15:17:57 +0000 (11:17 -0400)] 
Okay fine maybe it's an alpha.

9 years agoFold more changes files into the changelog
Nick Mathewson [Wed, 23 Mar 2016 14:31:28 +0000 (10:31 -0400)] 
Fold more changes files into the changelog

9 years agoRepair build when no sandbox support is enabled.
Nick Mathewson [Tue, 22 Mar 2016 17:18:18 +0000 (13:18 -0400)] 
Repair build when no sandbox support is enabled.

9 years agoMerge remote-tracking branch 'public/bug18253'
Nick Mathewson [Tue, 22 Mar 2016 14:08:50 +0000 (10:08 -0400)] 
Merge remote-tracking branch 'public/bug18253'

9 years agomake changes files pass lintChanges as appropriate
Nick Mathewson [Tue, 22 Mar 2016 13:59:51 +0000 (09:59 -0400)] 
make changes files pass lintChanges as appropriate

9 years agoTry to fix an intermittent test failure on openbsd.
Nick Mathewson [Tue, 22 Mar 2016 13:12:59 +0000 (09:12 -0400)] 
Try to fix an intermittent test failure on openbsd.

9 years agoNever use sprintf. tor_snprintf instead. Bug in tests, not in any released tor.
Nick Mathewson [Tue, 22 Mar 2016 12:52:17 +0000 (08:52 -0400)] 
Never use sprintf. tor_snprintf instead. Bug in tests, not in any released tor.

9 years agoFix an fd leak in check_private_dir().
Nick Mathewson [Tue, 22 Mar 2016 12:29:51 +0000 (08:29 -0400)] 
Fix an fd leak in check_private_dir().

The fd would leak when the User wasn't recogniezed by
getpwnam(). Since we'd then go on to exit, this wasn't a terribad
leak, but it's still not as nice as no leak at all.

CID 1355640; bugfix on no released Tor.

9 years agoremove extraneous breaks
Roger Dingledine [Mon, 21 Mar 2016 21:11:18 +0000 (17:11 -0400)] 
remove extraneous breaks

commit edeba3d4 removed a switch, but left the "break" lines in
from that switch. fortunately the resulting behavior was not wrong,
since there was an outer switch that it was ok to break from.

9 years agofix indentation after #18332 patches
Roger Dingledine [Mon, 21 Mar 2016 21:08:02 +0000 (17:08 -0400)] 
fix indentation after #18332 patches

no actual changes here -- but the new indenting makes it clear
that the fixes in #18332 were not as good as they should have been.
the next commit will deal with that.

9 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Mon, 21 Mar 2016 17:26:04 +0000 (13:26 -0400)] 
Merge branch 'maint-0.2.7'

9 years agoMerge branch 'ed25519_voting_fixes_squashed' into maint-0.2.7
Nick Mathewson [Mon, 21 Mar 2016 17:25:12 +0000 (13:25 -0400)] 
Merge branch 'ed25519_voting_fixes_squashed' into maint-0.2.7

9 years agoUse nth consistently in dircollate.h.
Nick Mathewson [Tue, 15 Mar 2016 14:39:50 +0000 (10:39 -0400)] 
Use nth consistently in dircollate.h.

Documentation-only patch. Issue 17668.T6.

9 years agoIn routers_make_ed_keys_unique, break ties for published_on
Nick Mathewson [Tue, 15 Mar 2016 14:34:05 +0000 (10:34 -0400)] 
In routers_make_ed_keys_unique, break ties for published_on

This ensures that if we can't use published_on to decide an ed,rsa
mapping, we at least decide deterministically.

Resolves 17668.T3

9 years agoAssert that dircollator is collated when we're reading its output.
Nick Mathewson [Tue, 15 Mar 2016 14:24:18 +0000 (10:24 -0400)] 
Assert that dircollator is collated when we're reading its output.

Fix for 17668.S2.

9 years agoAfter we strip out duplicate entries from 'routers', don't use 'rl'.
Nick Mathewson [Tue, 15 Mar 2016 14:15:59 +0000 (10:15 -0400)] 
After we strip out duplicate entries from 'routers', don't use 'rl'.

We've got to make sure that every single subsequent calculation in
dirserv_generate_networkstatus_vote_obj() are based on the list of
routerinfo_t *after* we've removed possible duplicates, not before.
Fortunately, none of the functions that were taking a routerlist_t
as an argument were actually using any fields other than this list
of routers.

Resolves issue 18318.DG3.

9 years agoFix another case of 17668: Add NoEdConsensus
Nick Mathewson [Tue, 23 Feb 2016 14:31:23 +0000 (09:31 -0500)] 
Fix another case of 17668: Add NoEdConsensus

I had a half-built mechanism to track, during the voting process,
whether the Ed25519 value (or lack thereof) reflected a true
consensus among the authorities.  But we never actually inserted this
field in the consensus.

The key idea here is that we first attempt to match up votes by pairs
of <Ed,RSA>, where <Ed> can be NULL if we're told that there is no
Ed key.  If this succeeds, then we can treat all those votes as 'a
consensus for Ed'.  And we can include all other votes with a
matching RSA key and no statement about Ed keys as being "also about
the same relay."

After that, we look for RSA keys we haven't actually found an entry
for yet, and see if there are enough votes for them, NOT considering
Ed keys.  If there are, we match them as before, but we treat them
as "not a consensus about ed".

When we include an entry in a consensus, if it does not reflect a
consensus about ed keys, then we include a new NoEdConsensus flag on
it.

This is all only for consensus method 22 or later.

Also see corresponding dir-spec patch.

9 years agoDocument has_ed25519_listing
Nick Mathewson [Tue, 23 Feb 2016 13:13:39 +0000 (08:13 -0500)] 
Document has_ed25519_listing

9 years agoNever vote for an ed key twice.
Nick Mathewson [Mon, 22 Feb 2016 16:43:59 +0000 (11:43 -0500)] 
Never vote for an ed key twice.

When generating a vote, and we have two routerinfos with the same ed
key, omit the one published earlier.

This was supposed to have been solved by key pinning, but when I
made key pinning optional, I didn't realize that this would jump up
and bite us.  It is part of bug 18318, and the root cause of 17668.

9 years agoFix log message subjects in networkstatus_parse_vote_from_string()
Nick Mathewson [Mon, 22 Feb 2016 15:59:27 +0000 (10:59 -0500)] 
Fix log message subjects in networkstatus_parse_vote_from_string()

Some of these messages called the thing being parsed a "vote" whether
it is a vote or a consensus.

Fixes bug 18368.

9 years agoDocument dircollate.c (and remove an unused global)
Nick Mathewson [Mon, 22 Feb 2016 15:39:42 +0000 (10:39 -0500)] 
Document dircollate.c (and remove an unused global)

9 years agopunctuate changes file better
Nick Mathewson [Mon, 21 Mar 2016 16:37:10 +0000 (12:37 -0400)] 
punctuate changes file better

9 years agoMerge remote-tracking branch 'public/bug18548'
Nick Mathewson [Mon, 21 Mar 2016 16:36:41 +0000 (12:36 -0400)] 
Merge remote-tracking branch 'public/bug18548'

9 years agoMerge remote-tracking branch 'public/bug17443_v2'
Nick Mathewson [Mon, 21 Mar 2016 15:21:31 +0000 (11:21 -0400)] 
Merge remote-tracking branch 'public/bug17443_v2'

9 years agoRun "formatChangelog"
Nick Mathewson [Mon, 21 Mar 2016 15:18:45 +0000 (11:18 -0400)] 
Run "formatChangelog"

9 years agoSort changes files into changelog.
Nick Mathewson [Mon, 21 Mar 2016 15:18:15 +0000 (11:18 -0400)] 
Sort changes files into changelog.

9 years agoFix (most) lintChanges warnings on master.
Nick Mathewson [Mon, 21 Mar 2016 15:14:57 +0000 (11:14 -0400)] 
Fix (most) lintChanges warnings on master.

9 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Mon, 21 Mar 2016 15:01:47 +0000 (11:01 -0400)] 
Merge branch 'maint-0.2.7'

9 years agoa couple more changes files issues.
Nick Mathewson [Mon, 21 Mar 2016 15:00:50 +0000 (11:00 -0400)] 
a couple more changes files issues.

9 years agoFix some warnings from lintchanges.
Nick Mathewson [Mon, 21 Mar 2016 14:58:29 +0000 (10:58 -0400)] 
Fix some warnings from lintchanges.

9 years agoMerge remote-tracking branch 'arma/ticket18332-try3'
Nick Mathewson [Mon, 21 Mar 2016 14:41:23 +0000 (10:41 -0400)] 
Merge remote-tracking branch 'arma/ticket18332-try3'

9 years agochanges file for 18600
Nick Mathewson [Mon, 21 Mar 2016 14:33:58 +0000 (10:33 -0400)] 
changes file for 18600

9 years agoMerge remote-tracking branch 'special/bug18600'
Nick Mathewson [Mon, 21 Mar 2016 14:32:39 +0000 (10:32 -0400)] 
Merge remote-tracking branch 'special/bug18600'

9 years agoMerge branch 'bug18570_027'
Nick Mathewson [Mon, 21 Mar 2016 14:20:16 +0000 (10:20 -0400)] 
Merge branch 'bug18570_027'

9 years agochanges file for bug18570
Nick Mathewson [Mon, 21 Mar 2016 14:19:07 +0000 (10:19 -0400)] 
changes file for bug18570

9 years agoMake sure channel_t queues its own copy of incoming cells
Andrea Shepard [Tue, 15 Mar 2016 07:40:19 +0000 (07:40 +0000)] 
Make sure channel_t queues its own copy of incoming cells

9 years agoAdd new channel/queue_incoming unit tests; modify channel unit tests for new clarifie...
Andrea Shepard [Tue, 15 Mar 2016 03:28:04 +0000 (03:28 +0000)] 
Add new channel/queue_incoming unit tests; modify channel unit tests for new clarified handling of alloc/free responsibility for queued incoming cells

9 years agotest_options.c: assert that TransProxyType is tested
Steven Chamberlain [Fri, 18 Mar 2016 13:17:18 +0000 (13:17 +0000)] 
test_options.c: assert that TransProxyType is tested

If a new platform defines USE_TRANSPARENT, ensure that a test runs for
its TransProxyType.

9 years agoScrub service name in introduction circuit warning
John Brooks [Mon, 21 Mar 2016 12:22:14 +0000 (19:22 +0700)] 
Scrub service name in introduction circuit warning

Fixes bug 18600.

9 years agotest_options.c: NULL a pointer after free #18447
Steven Chamberlain [Mon, 29 Feb 2016 14:09:07 +0000 (14:09 +0000)] 
test_options.c: NULL a pointer after free #18447

tdata will be double-freed if none of linux, __FreeBSD__, DARWIN or
__OpenBSD__ are defined.  (For example, FreeBSD derivatives).

9 years agoBridges now refuse "rendezvous2" publish attempts
Roger Dingledine [Wed, 16 Mar 2016 20:46:14 +0000 (16:46 -0400)] 
Bridges now refuse "rendezvous2" publish attempts

Suggested during review of ticket 18332.

9 years agoSandbox: Don't preseed getaddrinfo(gethostname()) in client mode.
Nick Mathewson [Tue, 15 Mar 2016 15:19:59 +0000 (11:19 -0400)] 
Sandbox: Don't preseed getaddrinfo(gethostname()) in client mode.

If we're a server with no address configured, resolve_my_hostname
will need this.  But not otherwise.  And the preseeding itself can
consume a few seconds if like tails we have no resolvers.

Fixes bug 18548.

9 years agoFix whitespace.
Nick Mathewson [Tue, 15 Mar 2016 13:21:29 +0000 (09:21 -0400)] 
Fix whitespace.

9 years agoMerge remote-tracking branch 'weasel/bug18458'
Nick Mathewson [Tue, 15 Mar 2016 13:18:24 +0000 (09:18 -0400)] 
Merge remote-tracking branch 'weasel/bug18458'

9 years agoFix log message: say RelaxDirModeCheck instead of StrictDirModes
Peter Palfrader [Mon, 14 Mar 2016 19:27:53 +0000 (20:27 +0100)] 
Fix log message: say RelaxDirModeCheck instead of StrictDirModes

9 years agoMerge branch 'bug15221_027'
Nick Mathewson [Mon, 14 Mar 2016 18:10:47 +0000 (14:10 -0400)] 
Merge branch 'bug15221_027'

9 years agoChanges file for bug18253
Nick Mathewson [Mon, 14 Mar 2016 18:09:43 +0000 (14:09 -0400)] 
Changes file for bug18253

9 years agoMake unix sockets work with the linux seccomp2 sandbox again
Nick Mathewson [Mon, 14 Mar 2016 18:07:02 +0000 (14:07 -0400)] 
Make unix sockets work with the linux seccomp2 sandbox again

I didn't want to grant blanket permissions for chmod() and chown(),
so here's what I had to do:
   * Grant open() on all parent directories of a unix socket
   * Write code to allow chmod() and chown() on a given file only.
   * Grant chmod() and chown() on the unix socket.

9 years agoDon't chmod/chown unix sockets if their permissions are already ok
Nick Mathewson [Mon, 14 Mar 2016 17:40:44 +0000 (13:40 -0400)] 
Don't chmod/chown unix sockets if their permissions are already ok

This is a part of a fix for 18253; bugfix on 0.2.8.1-alpha.

Alternatively, we could permit chmod/chown in the sandbox, but I
really don't like giving the sandbox permission to alter
permissions.

9 years agoPermit setrlimit, prlimit, prlimit64 calls.
Nick Mathewson [Mon, 14 Mar 2016 17:21:16 +0000 (13:21 -0400)] 
Permit setrlimit, prlimit, prlimit64 calls.

We call setrlimit under some circumstances, and it can call prlimit
and prlimit64 under the hood.

Fixes bug 15221.

9 years agoWhen using open() to make sure we created a dir, close the fd afterwards
Nick Mathewson [Mon, 14 Mar 2016 17:02:50 +0000 (13:02 -0400)] 
When using open() to make sure we created a dir, close the fd afterwards

Found by coverity. Not in any released Tor. Fixes CID 1355640.

Also, don't check for fd correctness with assert(fd).  You need to
assert (fd >= 0).

9 years agoMerge remote-tracking branch 'public/bug16248_027'
Nick Mathewson [Mon, 14 Mar 2016 16:53:57 +0000 (12:53 -0400)] 
Merge remote-tracking branch 'public/bug16248_027'

9 years agoAdd comments to connection_check_event().
Nick Mathewson [Mon, 14 Mar 2016 16:53:21 +0000 (12:53 -0400)] 
Add comments to connection_check_event().

9 years agohs: Do not close desc fetch conn. if we can't pick an HSDir
David Goulet [Mon, 14 Mar 2016 15:00:46 +0000 (11:00 -0400)] 
hs: Do not close desc fetch conn. if we can't pick an HSDir

Launching 7 descriptor fetches makes a connection to each HSDir that is 6
and the seventh one fails to pick an HSDir because they are all being used
already so it was killing all pending connections at once.

Fixes #15937

Signed-off-by: David Goulet <dgoulet@ev0ke.net>
9 years agosimplify the #18332 changes file based on feedback on ticket
Roger Dingledine [Fri, 11 Mar 2016 18:28:51 +0000 (13:28 -0500)] 
simplify the #18332 changes file based on feedback on ticket

9 years agoMerge remote-tracking branch 'teor/bug17153'
Nick Mathewson [Fri, 11 Mar 2016 16:23:58 +0000 (11:23 -0500)] 
Merge remote-tracking branch 'teor/bug17153'

9 years agoMerge remote-tracking branch 'teor/bug8976_01_028'
Nick Mathewson [Fri, 11 Mar 2016 16:11:38 +0000 (11:11 -0500)] 
Merge remote-tracking branch 'teor/bug8976_01_028'

9 years agoChange behavior on missing/present event to warn instead of asserting.
Nick Mathewson [Fri, 11 Mar 2016 15:50:36 +0000 (10:50 -0500)] 
Change behavior on missing/present event to warn instead of asserting.

Add a changes file.

9 years agosimplify rend_cache_store_status_t back to a boolean
Roger Dingledine [Tue, 8 Mar 2016 00:29:05 +0000 (19:29 -0500)] 
simplify rend_cache_store_status_t back to a boolean

it used to be a tri-state, but now it's just a bi-state, so we can
take out all the machinery like the enum.

9 years agorip out rend_id_is_in_interval()
Roger Dingledine [Fri, 11 Mar 2016 15:46:21 +0000 (10:46 -0500)] 
rip out rend_id_is_in_interval()

it was used by hid_serv_responsible_for_desc_id(), which we no
longer use.

9 years agorip out hid_serv_acting_as_directory()
Roger Dingledine [Fri, 11 Mar 2016 15:45:03 +0000 (10:45 -0500)] 
rip out hid_serv_acting_as_directory()

When we made HidServDirectoryV2 always 1, we removed the situation
where a relay could choose not to be an HSDir. Now simplify the
rest of the code to reflect this decision.

(We have to remove two apparently unrelated free() calls in the unit
tests, since they used to free stuff that we created as a side effect
of calling router_get_my_routerinfo(), and now we no longer call that.)

9 years agorip out hid_serv_responsible_for_desc_id()
Roger Dingledine [Fri, 11 Mar 2016 15:40:31 +0000 (10:40 -0500)] 
rip out hid_serv_responsible_for_desc_id()

This simplifies relay behavior, because the relay offers the hsdir
functionality independent of whether the directory authorities have
decided this relay is suitable for clients to use yet.

Implements ticket 18332.

9 years agoIf we start/stop reading on a dnsserv connection, don't assert.
Nick Mathewson [Fri, 11 Mar 2016 15:33:19 +0000 (10:33 -0500)] 
If we start/stop reading on a dnsserv connection, don't assert.

Fixes bug 16248. Patch from cypherpunks.  Bugfix on 0.2.0.1-alpha.

9 years agoMerge remote-tracking branch 'teor/bug18454'
Nick Mathewson [Fri, 11 Mar 2016 15:22:41 +0000 (10:22 -0500)] 
Merge remote-tracking branch 'teor/bug18454'

9 years agoMerge remote-tracking branch 'public/bug18204_028'
Nick Mathewson [Fri, 11 Mar 2016 15:10:15 +0000 (10:10 -0500)] 
Merge remote-tracking branch 'public/bug18204_028'

9 years agoMove Automake options to configure.ac
cypherpunks [Fri, 26 Feb 2016 12:53:28 +0000 (12:53 +0000)] 
Move Automake options to configure.ac

This will centralize the version configuration in one file to simplify
future changes.

Also fixes some typos in the Automake options comments.

9 years agoAdd changes file for 18448; refactor
Nick Mathewson [Fri, 11 Mar 2016 15:05:28 +0000 (10:05 -0500)] 
Add changes file for 18448; refactor

(I've made it so FreeBSD || FreeBSD_kernel is enough to ensure that
we think you might have ipfw, and so that the logic is all in one
place.)

9 years agoenable and test transproxy on FreeBSD derivatives #18448
Steven Chamberlain [Mon, 29 Feb 2016 14:15:20 +0000 (14:15 +0000)] 
enable and test transproxy on FreeBSD derivatives #18448

The transproxy feature is only enabled when __FreeBSD__ is defined, and
only regular FreeBSD does that.  Change this to __FreeBSD_kernel__ which
is defined on derivatives as well.

This enables the relevant options/validate__transproxy test on FreeBSD
derivatives.

9 years agoDo not link tests against both libor.a and libor-testing.a
Nick Mathewson [Fri, 11 Mar 2016 14:53:25 +0000 (09:53 -0500)] 
Do not link tests against both libor.a and libor-testing.a

Also, put libor-testing.a at a better position in the list of
libraries, to avoid linker errors.

This is a fix, or part of a fix, for 18490.

9 years agomoving hid_serv_get_responsible_directories and hid_serv_acting_as_directory from...
Hassan Alsibyani [Mon, 29 Feb 2016 06:47:51 +0000 (01:47 -0500)] 
moving hid_serv_get_responsible_directories and hid_serv_acting_as_directory from routerlist.c to rendcommon.c

9 years agoFedora Core->Fedora; yum->dnf.
Nick Mathewson [Fri, 11 Mar 2016 14:13:33 +0000 (09:13 -0500)] 
Fedora Core->Fedora; yum->dnf.

Closes 18426 and 18459.

9 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Wed, 9 Mar 2016 15:37:00 +0000 (10:37 -0500)] 
Merge branch 'maint-0.2.7'

9 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Wed, 9 Mar 2016 15:36:50 +0000 (10:36 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

9 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 9 Mar 2016 15:36:35 +0000 (10:36 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

9 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 9 Mar 2016 15:36:20 +0000 (10:36 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

9 years ago0.2.5.12 got left out of the changelog somehow
Roger Dingledine [Mon, 7 Mar 2016 18:05:40 +0000 (13:05 -0500)] 
0.2.5.12 got left out of the changelog somehow

9 years agoCorrectly duplicate addresses in get_interface_address6_list
teor (Tim Wilson-Brown) [Fri, 4 Mar 2016 17:42:27 +0000 (18:42 +0100)] 
Correctly duplicate addresses in get_interface_address6_list

9 years agoAvoid freeing an uninitialised pointer in get_interface_addresses_ioctl
teor (Tim Wilson-Brown) [Fri, 4 Mar 2016 17:41:49 +0000 (18:41 +0100)] 
Avoid freeing an uninitialised pointer in get_interface_addresses_ioctl

9 years agoAdd a changes file for bug 8976
teor (Tim Wilson-Brown) [Fri, 4 Mar 2016 17:31:07 +0000 (18:31 +0100)] 
Add a changes file for bug 8976

9 years agoReject multicast rendezvous point addresses
teor (Tim Wilson-Brown) [Tue, 2 Feb 2016 02:32:54 +0000 (13:32 +1100)] 
Reject multicast rendezvous point addresses

Unless ExtendAllowPrivateAddresses is 1.

9 years agoUpdate geoip and geoip6 to the March 3 2016 database.
Karsten Loesing [Fri, 4 Mar 2016 09:56:51 +0000 (10:56 +0100)] 
Update geoip and geoip6 to the March 3 2016 database.

9 years agoRemove an extraneous space in a log message
teor (Tim Wilson-Brown) [Tue, 1 Mar 2016 18:08:02 +0000 (19:08 +0100)] 
Remove an extraneous space in a log message

9 years agoAdd a changes file for #18458
Peter Palfrader [Tue, 1 Mar 2016 17:48:57 +0000 (18:48 +0100)] 
Add a changes file for #18458

9 years agoFirst RelaxDirModeCheck implementation
Peter Palfrader [Tue, 1 Mar 2016 16:08:14 +0000 (17:08 +0100)] 
First RelaxDirModeCheck implementation

9 years agoAllow internal IPv6 addresses in descriptors in private networks
teor (Tim Wilson-Brown) [Tue, 1 Mar 2016 15:41:52 +0000 (16:41 +0100)] 
Allow internal IPv6 addresses in descriptors in private networks

9 years agoclean/extend some module docs, including fix from #18403
Nick Mathewson [Sun, 28 Feb 2016 16:57:47 +0000 (17:57 +0100)] 
clean/extend some module docs, including fix from #18403

9 years agoMerge remote-tracking branch 'teor/fallbacks-201602-v2'
Nick Mathewson [Sun, 28 Feb 2016 14:51:22 +0000 (15:51 +0100)] 
Merge remote-tracking branch 'teor/fallbacks-201602-v2'

9 years agoMerge remote-tracking branch 'teor/bug18123'
Nick Mathewson [Sun, 28 Feb 2016 14:40:35 +0000 (15:40 +0100)] 
Merge remote-tracking branch 'teor/bug18123'

9 years agoUse the kdf_rfc5869() function instead of kdf().
Alexander Færøy [Thu, 25 Feb 2016 22:39:14 +0000 (23:39 +0100)] 
Use the kdf_rfc5869() function instead of kdf().

This patch fixes an issue in "ntor_ref.py gen_kdf_vectors" where the
script tries to call the undefined function kdf().

9 years agoMerge remote-tracking branch 'teor/bug17193'
Nick Mathewson [Sun, 28 Feb 2016 14:22:56 +0000 (15:22 +0100)] 
Merge remote-tracking branch 'teor/bug17193'