summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-05-21Merge branch 'maint-0.2.2'Roger Dingledine
2011-05-21remove some (confusing) dead codeRoger Dingledine
2011-05-21Merge branch 'bug1810' into maint-0.2.2Roger Dingledine
2011-05-21Don't recreate descriptor on sighupSebastian Hahn
We used to regenerate our descriptor whenever we'd get a sighup. This was caused by a bug in options_transition_affects_workers() that would return true even if the options were exactly the same. Down the call path we'd call init_keys(), which made us make a new descriptor which the authorities would reject, and the node would subsequently fall out of the consensus. This patch fixes only the first part of this bug: options_transition_affects_workers() behaves correctly now. The second part still wants a fix.
2011-05-20what's up with this trailing whitespaceRoger Dingledine
2011-05-20Merge branch 'maint-0.2.2'Roger Dingledine
2011-05-19log the reason for publishing a new relay descriptorRoger Dingledine
now we have a better chance of hunting down the root cause of bug 1810.
2011-05-20Fix a compile warning on OSX 10.6Sebastian Hahn
2011-05-19add 0.2.2.27-beta changelog to masterRoger Dingledine
also clean up the 0.2.3.1-alpha changelog headers
2011-05-17copy the 0.2.2.26-beta changelog to master tooRoger Dingledine
2011-05-17Merge branch 'maint-0.2.2'Roger Dingledine
2011-05-17discard circuits when we change our bridge configurationRoger Dingledine
otherwise we might reuse circuits from the previous configuration, which could be bad depending on the user's situation
2011-05-17Merge branch 'maint-0.2.2'Roger Dingledine
2011-05-17refetch bridge descriptors in a timely fashionRoger Dingledine
When we configure a new bridge via the controller, don't wait up to ten seconds before trying to fetch its descriptor. This wasn't so bad when you listed your bridges in torrc, but it's dreadful if you configure your bridges via vidalia.
2011-05-17Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-05-17Merge branch 'bug2752' into maint-0.2.2Nick Mathewson
2011-05-17Add credit to bug2752; correct the issue number in the changes fileNick Mathewson
2011-05-17Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-05-17Handle NULL argument to get_configured_bridge_by_addr_port_digestNick Mathewson
Fixes bug 2313; bugfix on 0.2.2.26-beta.
2011-05-17Oops; that function got renamed.Nick Mathewson
2011-05-17Check onion keys in microdescriptors, tooRobert Ransom
2011-05-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-05-16Remove from maint-0.2.2 changes files merged in release-0.2.2 and masterNick Mathewson
2011-05-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-05-16Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
Conflicts: changes/bug2190 changes/forget-rend-descs-on-newnym
2011-05-16rm files for changes merged in all of release021, release022, masterNick Mathewson
2011-05-16Fix bug2752 : 48-char HTTPProxyAuthenticator limitationMichael Yakubovich
Bumped the char maximum to 512 for HTTPProxyAuthenticator & HTTPSProxyAuthenticator. Now stripping all '\n' after base64 encoding in alloc_http_authenticator.
2011-05-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-05-16Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
Fixed trivial conflict due to headers moving into their own .h files from or.h. Conflicts: src/or/or.h
2011-05-16squash! Add crypto_pk_check_key_public_exponent functionNick Mathewson
Rename crypto_pk_check_key_public_exponent to crypto_pk_public_exponent_ok: it's nice to name predicates s.t. you can tell how to interpret true and false.
2011-05-16Require that certain public keys have public exponent 65537Robert Ransom
2011-05-16Add crypto_pk_check_key_public_exponent functionRobert Ransom
2011-05-16Check fetched rendezvous descriptors' service IDsRobert Ransom
2011-05-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/connection.c
2011-05-16Merge remote-tracking branch 'public/bug2850' into maint-0.2.2Nick Mathewson
Fixed a trivial conflict where this and the ControlSocketGroupWritable code both added different functions to the same part of connection.c. Conflicts: src/or/connection.c
2011-05-15Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-05-15Increase the length of the buffer in smartlist_string_num_isin().Nick Mathewson
This was harmless, since we only used this for checking for lists of port values, but it's the principle of the thing. Fixes 3175; bugfix on 0.1.0.1-rc
2011-05-15Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-05-15Merge branch 'bug2972' into maint-0.2.2Nick Mathewson
2011-05-15Make check_private_dir check for group ownership as appropriateNick Mathewson
2011-05-15Fix up some comment issues spotted by rransomNick Mathewson
2011-05-15Check permissions on the directory holding a control socketNick Mathewson
2011-05-15Add a new flag to check_private_dir to make it _not_ change permissionsNick Mathewson
We'll need this for checking permissions on the directories that hold control sockets: if somebody says "ControlSocket ~/foo", it would be pretty rude to do a chmod 700 on their homedir.
2011-05-15Add a function to pull off the final component of a pathNick Mathewson
2011-05-15Make check_private_dir accept g+rx dirs if told to do so.Nick Mathewson
2011-05-15Clean up the 2972 implementation a littleSebastian Hahn
2011-05-15Add UnixSocketsGroupWritable config flagJérémy Bobbio
When running a system-wide instance of Tor on Unix-like systems, having a ControlSocket is a quite handy mechanism to access Tor control channel. But it would be easier if access to the Unix domain socket can be granted by making control users members of the group running the Tor process. This change introduces a UnixSocketsGroupWritable option, which will create Unix domain sockets (and thus ControlSocket) 'g+rw'. This allows ControlSocket to offer same access control measures than ControlPort+CookieAuthFileGroupReadable. See <http://bugs.debian.org/552556> for more details.
2011-05-15Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/circuitbuild.h
2011-05-15Preserve bridge download status across SETCONF, HUPNick Mathewson
This code changes it so that we don't remove bridges immediately when we start re-parsing our configuration. Instead, we mark them all, and remove all the marked ones after re-parsing our bridge lines. As we add a bridge, we see if it's already in the list. If so, we just unmark it. This new behavior will lose the property we used to have that bridges were in bridge_list in the same order in which they appeared in the torrc. I took a quick look through the code, and I'm pretty sure we didn't actually depend on that anywhere. This is for bug 3019; it's a fix on 0.2.0.3-alpha.
2011-05-15Fixup whitespace issues from 3122 commit in 0.2.3Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion