summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-22Merge remote-tracking branch 'public/bug18253'Nick Mathewson
2016-03-22make changes files pass lintChanges as appropriateNick Mathewson
2016-03-22Try to fix an intermittent test failure on openbsd.Nick Mathewson
2016-03-22Never use sprintf. tor_snprintf instead. Bug in tests, not in any released tor.Nick Mathewson
2016-03-22Fix an fd leak in check_private_dir().Nick Mathewson
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.
2016-03-21remove extraneous breaksRoger Dingledine
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.
2016-03-21fix indentation after #18332 patchesRoger Dingledine
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.
2016-03-21Merge branch 'maint-0.2.7'Nick Mathewson
2016-03-21Merge branch 'ed25519_voting_fixes_squashed' into maint-0.2.7Nick Mathewson
2016-03-21Use nth consistently in dircollate.h.Nick Mathewson
Documentation-only patch. Issue 17668.T6.
2016-03-21In routers_make_ed_keys_unique, break ties for published_onNick Mathewson
This ensures that if we can't use published_on to decide an ed,rsa mapping, we at least decide deterministically. Resolves 17668.T3
2016-03-21Assert that dircollator is collated when we're reading its output.Nick Mathewson
Fix for 17668.S2.
2016-03-21After we strip out duplicate entries from 'routers', don't use 'rl'.Nick Mathewson
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.
2016-03-21Fix another case of 17668: Add NoEdConsensusNick Mathewson
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.
2016-03-21Document has_ed25519_listingNick Mathewson
2016-03-21Never vote for an ed key twice.Nick Mathewson
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.
2016-03-21Fix log message subjects in networkstatus_parse_vote_from_string()Nick Mathewson
Some of these messages called the thing being parsed a "vote" whether it is a vote or a consensus. Fixes bug 18368.
2016-03-21Document dircollate.c (and remove an unused global)Nick Mathewson
2016-03-21punctuate changes file betterNick Mathewson
2016-03-21Merge remote-tracking branch 'public/bug18548'Nick Mathewson
2016-03-21Merge remote-tracking branch 'public/bug17443_v2'Nick Mathewson
2016-03-21Run "formatChangelog"Nick Mathewson
2016-03-21Sort changes files into changelog.Nick Mathewson
2016-03-21Fix (most) lintChanges warnings on master.Nick Mathewson
2016-03-21Merge branch 'maint-0.2.7'Nick Mathewson
2016-03-21a couple more changes files issues.Nick Mathewson
2016-03-21Fix some warnings from lintchanges.Nick Mathewson
2016-03-21Merge remote-tracking branch 'arma/ticket18332-try3'Nick Mathewson
2016-03-21changes file for 18600Nick Mathewson
2016-03-21Merge remote-tracking branch 'special/bug18600'Nick Mathewson
2016-03-21Merge branch 'bug18570_027'Nick Mathewson
2016-03-21changes file for bug18570Nick Mathewson
2016-03-21Make sure channel_t queues its own copy of incoming cellsAndrea Shepard
2016-03-21Add new channel/queue_incoming unit tests; modify channel unit tests for new ↵Andrea Shepard
clarified handling of alloc/free responsibility for queued incoming cells
2016-03-21test_options.c: assert that TransProxyType is testedSteven Chamberlain
If a new platform defines USE_TRANSPARENT, ensure that a test runs for its TransProxyType.
2016-03-21Scrub service name in introduction circuit warningJohn Brooks
Fixes bug 18600.
2016-03-17test_options.c: NULL a pointer after free #18447Steven Chamberlain
tdata will be double-freed if none of linux, __FreeBSD__, DARWIN or __OpenBSD__ are defined. (For example, FreeBSD derivatives).
2016-03-16Bridges now refuse "rendezvous2" publish attemptsRoger Dingledine
Suggested during review of ticket 18332.
2016-03-15Sandbox: Don't preseed getaddrinfo(gethostname()) in client mode.Nick Mathewson
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.
2016-03-15Fix whitespace.Nick Mathewson
2016-03-15Merge remote-tracking branch 'weasel/bug18458'Nick Mathewson
2016-03-14Fix log message: say RelaxDirModeCheck instead of StrictDirModesPeter Palfrader
2016-03-14Merge branch 'bug15221_027'Nick Mathewson
2016-03-14Changes file for bug18253Nick Mathewson
2016-03-14Make unix sockets work with the linux seccomp2 sandbox againNick Mathewson
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.
2016-03-14Don't chmod/chown unix sockets if their permissions are already okNick Mathewson
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.
2016-03-14Permit setrlimit, prlimit, prlimit64 calls.Nick Mathewson
We call setrlimit under some circumstances, and it can call prlimit and prlimit64 under the hood. Fixes bug 15221.
2016-03-14When using open() to make sure we created a dir, close the fd afterwardsNick Mathewson
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).
2016-03-14Merge remote-tracking branch 'public/bug16248_027'Nick Mathewson
2016-03-14Add comments to connection_check_event().Nick Mathewson