summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2014-03-06Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2014-03-06Merge branch 'bug11108'Nick Mathewson
2014-03-06Correct the URL in the "a relay on win95???" messageNick Mathewson
This is a fix for 9393; it's not a bugfix on any Tor version per se, but rather on whatever Tor version was current when we reorganized the wiki.
2014-03-05Fix whitespace errors, all of them mine.Nick Mathewson
2014-03-05Rename PredictedCircsRelevanceTime->PredictedPortsRelevanceTimeNick Mathewson
All circuits are predictive; it's the ports that are expiring here.
2014-03-05Merge branch 'ticket9176_squashed'Nick Mathewson
Conflicts: doc/tor.1.txt
2014-03-05Fix wide lines.Nick Mathewson
2014-03-05Lower the maximum for PrecictedCircsRelevanceTime to one hourNick Mathewson
2014-03-05Fixed spacing.unixninja92
2014-03-05Added max value to PredictedCircsRelevanceTime.unixninja92
2014-03-05PredictedCircsRelevanceTime: limit how long we predict a port will be usedunixninja92
By default, after you've made a connection to port XYZ, we assume you might still want to have an exit ready to connect to XYZ for one hour. This patch lets you lower that interval. Implements ticket 91
2014-03-05Merge remote-tracking branch 'arma/ticket5528'Nick Mathewson
Conflicts: src/or/router.c src/test/test_dir.c
2014-03-04Include v3 in documented 'protocols' in rend_service_descriptor_tNick Mathewson
Also make it unsigned and document that it's for INTRODUCE cell versions. Fixes 9099; bugfix on 0.2.1.5-alpha, which introduced the v3 protocol.
2014-03-04Merge branch 'bug10169_025_v2'Nick Mathewson
Conflicts: src/test/test.c
2014-03-04Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2Nick Mathewson
Conflicts: src/common/compat_libevent.h src/or/relay.c
2014-03-04Merge remote-tracking branch 'public/bug10169_023' into bug10169_024Nick Mathewson
Conflicts: src/or/relay.c
2014-03-03ATTR_NORETURN is needed on lost_owning_controller nowNick Mathewson
This should fixes some "hey, that function could have __attribute__((noreturn))" warnings introduced by f96400d9. Bug not in any released version of Tor.
2014-03-03Warn if ports are specified in {Socks,Dir}PolicyNick Mathewson
We have ignored any ports listed here since 80365b989 (0.0.7rc1), but we didn't warn the user that we were ignoring them. This patch adds a warning if you put explicit ports in any of the options {Socks,Dir}Policy or AuthDir{Reject,Invalid,BadDir,BadExit}. It also adjusts the manpage to say that ports are ignored. Fixes ticket 11108.
2014-03-03trivial whitespace fixesRoger Dingledine
2014-02-28whitespace fixNick Mathewson
2014-02-28Merge branch 'bug10884_squashed'Nick Mathewson
2014-02-28Unit tests for test_routerkeys_write_fingerprintNick Mathewson
2014-02-28Tighten router_write_fingerprint implNick Mathewson
2014-02-28Write hashed bridge fingerprint to logs and to disk.Karsten Loesing
Implements #10884.
2014-02-28Merge remote-tracking branch 'karsten/task-5824'Nick Mathewson
2014-02-26Monotonize the OOM-killer data timersNick Mathewson
In a couple of places, to implement the OOM-circuit-killer defense against sniper attacks, we have counters to remember the age of cells or data chunks. These timers were based on wall clock time, which can move backwards, thus giving roll-over results for our age calculation. This commit creates a low-budget monotonic time, based on ratcheting gettimeofday(), so that even in the event of a time rollback, we don't do anything _really_ stupid. A future version of Tor should update this function to do something even less stupid here, like employ clock_gettime() or its kin.
2014-02-25Merge remote-tracking branch 'public/bug10449'Nick Mathewson
2014-02-25Merge remote-tracking branch 'public/no_itime_queue' into maint-0.2.4Nick Mathewson
2014-02-24Merge remote-tracking branch 'public/feature9777_024_squashed' into maint-0.2.4Nick Mathewson
2014-02-21When not an exit node, don't test for DNS hijacking.Nick Mathewson
Back in 5e762e6a5c0e6729bb7dbb586af2690c087d9ba8, non-exit servers stopped launching DNS requests for users. So there's no need for them to see if their DNS answers are hijacked. Patch from Matt Pagan. I think this is a 965 fix.
2014-02-21Merge remote-tracking branch 'public/bug10987_024'Nick Mathewson
2014-02-21Style tweaks on code, changes file for 10987Nick Mathewson
2014-02-21Fix: send back correct IPv6 SOCKS5 connect replyDavid Goulet
For a client using a SocksPort connection and IPv6, the connect reply from tor daemon did not handle AF_INET6 thus sending back the wrong payload to the client. A changes file is provided and this fixes #10987 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2014-02-16Merge remote-tracking branch 'public/bug10722'Nick Mathewson
2014-02-16Warning message when bug 10722 would triggerNick Mathewson
If somebody's excludenodes settings are keeping their hidden service connections from working, they should probably get notified about it.
2014-02-15Merge branch 'bug4900_siphash_v2'Nick Mathewson
2014-02-15Remove a bunch of functions that were never called.Nick Mathewson
2014-02-15Merge remote-tracking branch 'public/bug10841'Nick Mathewson
2014-02-14tristate->enum in rendcommon functionsNick Mathewson
When we have more than two return values, we should really be using an enum rather than "-2 means this, -1 means that, 0 means this, and 1 or more means a number."
2014-02-14Remove another unused v0 hidserv function.Karsten Loesing
Noted by Nick on #10841.
2014-02-12On OOM, also log N circuits remainingNick Mathewson
2014-02-12More unit tests for OOM handling.Nick Mathewson
This gets us up to no interesting untested new or changed lines for the 10169 code.
2014-02-12Refactor OOM-handling functions for more testabilityNick Mathewson
This patch splits out some of the functions in OOM handling so that it's easier to check them without involving the rest of Tor or requiring that the circuits be "wired up".
2014-02-12Start writing tests for 10169.Nick Mathewson
Now we cover more chunk allocation functions.
2014-02-12Debugging code inbuffers.c for debugging chunk allocation.Nick Mathewson
Currently on; will disable later in this branch.
2014-02-12Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2Nick Mathewson
Conflicts: src/or/circuitlist.c
2014-02-12Merge remote-tracking branch 'public/bug10169_023' into bug10169_024Nick Mathewson
2014-02-12Actually release buffer freelists when handling OOM conditions.Nick Mathewson
Otherwise freeing buffers won't help for a little while.
2014-02-12Fix bugs in bug10169 bugfix memory trackingNick Mathewson
The chunk_grow() and chunk_copy() functions weren't adjusting the memory totals properly. Bugfix not on any released Tor version.
2014-02-12Split crypto_global_init() into pre/post configNick Mathewson
It's increasingly apparent that we want to make sure we initialize our PRNG nice and early, or else OpenSSL will do it for us. (OpenSSL doesn't do _too_ bad a job, but it's nice to do it ourselves.) We'll also need this for making sure we initialize the siphash key before we do any hashes.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion