summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2010-11-21bump to 0.2.2.19-alphaRoger Dingledine
2010-11-21Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2010-11-21Merge branch 'fix2204' into maint-0.2.1Nick Mathewson
2010-11-20Do not set the hostname TLS extension server-side; only client-sideNick Mathewson
This may fix bug 2204, and resolve the incompatibility with openssl 0.9.8p/1.0.0b.
2010-11-19Fix a unit test broken by fix for 2195Nick Mathewson
2010-11-19Merge branch 'fix2183', remote branch 'rransom/fix2195-v2' into maint-0.2.2Nick Mathewson
2010-11-19Fix logic error in router_dump_router_to_string.Robert Ransom
Spotted by Nick Mathewson.
2010-11-19Add comments to some of the bug2183 fix codeNick Mathewson
2010-11-17Generate a router descriptor even if generating an extra-info descriptor fails.Robert Ransom
Fixes bug #2195.
2010-11-17Do not emit an extra-info-digest descriptor line if the digest is zero.Robert Ransom
2010-11-17Tweak the bugfix for 2183 a bit more.Karsten Loesing
2010-11-16new development versionRoger Dingledine
2010-11-16bump to 0.2.2.18-alphaRoger Dingledine
2010-11-16warn more about AllowSingleHopExitsRoger Dingledine
2010-11-15Merge commit 'nickm/1776_redux_v1' into maint-0.2.2Roger Dingledine
2010-11-15Clean up my 1776 fix a bitNick Mathewson
Sebastian notes (and I think correctly) that one of our ||s should have been an &&, which simplifies a boolean expression to decide whether to replace bridges. I'm also refactoring out the negation at the start of the expression, to make it more readable.
2010-11-15Move controller event for socks warning into log_unsafe_socks_warningNick Mathewson
2010-11-15Merge branch 'bug2000_nm_022' into maint-0.2.2Nick Mathewson
2010-11-15Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2Nick Mathewson
2010-11-15Rate-limit unsafe socks warningSebastian Hahn
Pick 5 seconds as the limit. 5 seconds is a compromise here between making sure the user notices that the bad behaviour is (still) happening and not spamming their log too much needlessly (the log message is pretty long). We also keep warning every time if safesocks is specified, because then the user presumably wants to hear about every blocked instance. (This is based on the original patch by Sebastian, then backported to 0.2.2 and with warnings split into their own function.)
2010-11-15Don't use log_err for non-criticial warnings.Karsten Loesing
2010-11-15Try harder not to exceed the 50 KB extra-info descriptor limit.Karsten Loesing
Our checks that we don't exceed the 50 KB size limit of extra-info descriptors apparently failed. This patch fixes these checks and reserves another 250 bytes for appending the signature. Fixes bug 2183.
2010-11-12Avoid perma-blocking the controller on bug in shrink_freelistNick Mathewson
In all likelihood, this bug would make Tor assert, but if it doesn't, let's not have two bugs.
2010-11-12Disable logging to control port connections in buf_shrink_freelists.Robert Ransom
If buf_shrink_freelists calls log_warn for some reason, we don't want the log call itself to throw buf_shrink_freelists further off the rails.
2010-11-12Move the original log_info call out of the core of buf_shrink_freelists.Robert Ransom
Sending a log message to a control port can cause Tor to allocate a buffer, thereby changing the length of the freelist behind buf_shrink_freelists's back, thereby causing an assertion to fail. Fixes bug #1125.
2010-11-12Disable logging to control port connections in buf_shrink_freelists.Robert Ransom
If buf_shrink_freelists calls log_warn for some reason, we don't want the log call itself to throw buf_shrink_freelists further off the rails.
2010-11-12Move the original log_info call out of the core of buf_shrink_freelists.Robert Ransom
Sending a log message to a control port can cause Tor to allocate a buffer, thereby changing the length of the freelist behind buf_shrink_freelists's back, thereby causing an assertion to fail. Fixes bug #1125.
2010-11-11Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2010-11-11let unpublished bridges learn their ip address tooRoger Dingledine
2010-11-10Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2010-11-10Enforce multiplicity rules when parsing annotations.Nick Mathewson
We would never actually enforce multiplicity rules when parsing annotations, since the counts array never got entries added to it for annotations in the token list that got added by earlier calls to tokenize_string. Found by piebeer.
2010-11-10Fix a bug where seting allow_annotations==0 only ignores annotations, but ↵Nick Mathewson
does not block them
2010-11-10Bulletproof the routerlist manipulation functions to handle reinserting the ↵Nick Mathewson
same descriptor
2010-11-10Break NoPublish supportSebastian Hahn
2010-11-10Change Natd into NATD in our options.Sebastian Hahn
Breaking this out of the last commit because this might be more controversial.
2010-11-10Synx manpage and source wrt option capitalizationSebastian Hahn
We had a spelling discrepancy between the manpage and the source code for some option. Resolve these in favor of the manpage, because it makes more sense (for example, HTTP should be capitalized).
2010-11-10Comment out the (unused) RunTesting optionSebastian Hahn
The code that makes use of the RunTesting option is #if 0, so setting this option has no effect. Mark the option as obsolete for now, so that Tor doesn't list it as an available option erroneously.
2010-11-10Remove the torrc.complete file.Sebastian Hahn
We haven't been keeping it up to date, and the manpage exists as a replacement for users who want an overview of all available options.
2010-11-06move to the november 1 maxmind geoip dbRoger Dingledine
2010-11-02Fix the assert in bug 1776Nick Mathewson
In the case where old_router == NULL but sdmap has an entry for the router, we can currently safely infer that the old_router was not a bridge. Add an assert to ensure that this remains true, and fix the logic not to die with the tor_assert(old_router) call.
2010-10-26Remove delay to become HSDir in privnetsSebastian Hahn
2010-10-26Properly refcount client_identity_keySebastian Hahn
In a2bb0bf we started using a separate client identity key. When we are in "public server mode" (that means not a bridge) we will use the same key. Reusing the key without doing the proper refcounting leads to a segfault on cleanup during shutdown. Fix that. Also introduce an assert that triggers if our refcount falls below 0. That should never happen.
2010-10-21Fix a whitespace errorNick Mathewson
2010-10-21Merge branch 'bug988-nm' into maint-0.2.2Nick Mathewson
2010-10-21Add some asserts to get_{tlsclient|server}_identity_keyNick Mathewson
We now require that: - Only actual servers should ever call get_server_identity_key - If you're being a client or bridge, the client and server keys should differ. - If you're being a public relay, the client and server keys should be the same.
2010-10-21Rename get_client_identity_key to get_tlsclient_identity_keyNick Mathewson
2010-10-21Fix a remaining bug in Robert's bug1859 fix.Nick Mathewson
When intro->extend_info is created for an introduction point, it only starts out with a nickname, not necessarily an identity digest. Thus, doing router_get_by_digest isn't necessarily safe.
2010-10-21Merge remote branch 'hoganrobert/bug1859' into maint-0.2.2Nick Mathewson
2010-10-21Merge remote branch 'sebastian/relay_early_rend' into maint-0.2.2Nick Mathewson
2010-10-20Fix a logic error in 98aee84. Found by boboperNick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion