summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-08-13Apply coccinelle script to replace malloc(a*b)->calloc(a,b)Nick Mathewson
2014-08-13Add a simple coccinelle script to replace malloc->callocNick Mathewson
Coccinelle is a semantic patching tool that can automatically change C code via semantic patching. This script also replaces realloc with reallocarray as appropriate.
2014-08-13Add reallocarray clone so we can stop doing multiply-then-reallocateNick Mathewson
2014-08-08Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-08-06Build circuits more readily when DisableNetwork goes to 0Roger Dingledine
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.
2014-08-06fix three typos in commentsRoger Dingledine
2014-08-03and oh hey, repeat code :)Roger Dingledine
2014-08-03fix typoRoger Dingledine
2014-07-30Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-07-30Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' ↵Nick Mathewson
into maint-0.2.5 Conflicts: contrib/dist/tor.service.in
2014-07-30Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into ↵Nick Mathewson
maint-0.2.5
2014-07-30Verify configuration file via ExecStartPre in the systemd unit file (#12730).intrigeri
2014-07-30Explicitly disable RunAsDaemon in the systemd unit file (#12731).intrigeri
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.
2014-07-28Cast long long arguments to (int) for tt_int_op()Peter Palfrader
2014-07-28and bring all the changelogs into master tooRoger Dingledine
2014-07-28Merge branch 'maint-0.2.5'Roger Dingledine
Conflicts: configure.ac contrib/win32build/tor-mingw.nsi.in src/win32/orconfig.h
2014-07-28bump to 0.2.5.6-alphaRoger Dingledine
2014-07-28Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine
2014-07-28bump to 0.2.4.23Roger Dingledine
2014-07-28Merge branch 'maint-0.2.5'Roger Dingledine
2014-07-28Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine
2014-07-28Warn and drop the circuit if we receive an inbound 'relay early' cellRoger Dingledine
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.
2014-07-27add a changes file for bug 12718Roger Dingledine
2014-07-27Confusing log message when circuit can't be extendedArlo Breault
2014-07-25Merge branch 'maint-0.2.5'Roger Dingledine
2014-07-25get rid of already-merged prop221 changes fileRoger Dingledine
2014-07-25Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine
Conflicts: src/or/or.h
2014-07-25circuit_build_failed: distinguish "first hop chan failed", "CREATE failed"Nick Mathewson
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.)
2014-07-25Implement proposal 221: Stop sending CREATE_FASTNick Mathewson
This makes FastFirstHopPK an AUTOBOOL; makes the default "auto"; and makes the behavior of "auto" be "look at the consensus."
2014-07-24Merge branch 'maint-0.2.5'Roger Dingledine
2014-07-24get rid of already-merged bug12227 changes fileRoger Dingledine
2014-07-24Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine
2014-07-24Avoid illegal read off end of an array in prune_v2_cipher_listNick Mathewson
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.
2014-07-24fix typo that crept in to 0.2.4.4-alphaRoger Dingledine
2014-07-24Merge branch 'maint-0.2.5'Roger Dingledine
2014-07-24Raise guard threshold to top 25% or 2000 kilounitsRoger Dingledine
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.
2014-07-24Merge branch 'maint-0.2.5'Roger Dingledine
2014-07-24Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine
2014-07-24update manpage for numentryguards / numdirectoryguardsRoger Dingledine
2014-07-24add a NumDirectoryGuards consensus param tooRoger Dingledine
2014-07-24Add and use a new NumEntryGuards consensus parameter.Roger Dingledine
When specified, it overrides our default of 3 entry guards. (By default, it overrides the number of directory guards too.) Implements ticket 12688.
2014-07-23Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-07-23Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2014-07-23Merge branch 'curve25519-donna32' into maint-0.2.4Nick Mathewson
2014-07-23Put the bug number and correct credits in the changes file for the new ↵Nick Mathewson
curve25519-donna32
2014-07-21Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-07-21Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2014-07-21Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4Nick Mathewson
2014-07-21Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-07-21Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson