From 16778795f334e236e59b6b52e5313b94c817d284 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 7 Oct 2003 21:27:33 +0000 Subject: [PATCH] minor fixes; bump to 0.0.2pre10 svn:r551 --- INSTALL | 23 +++++++++++++++++++++-- README | 28 +--------------------------- configure.in | 2 +- doc/CLIENTS | 10 +++++----- src/or/config.c | 4 ++-- src/or/onion.c | 2 +- 6 files changed, 31 insertions(+), 38 deletions(-) diff --git a/INSTALL b/INSTALL index c56626863..608b83af7 100644 --- a/INSTALL +++ b/INSTALL @@ -11,6 +11,8 @@ Quickstart version for users: 6) point your browser to socks4 or socks5 proxy at localhost port 9050. In mozilla, this is in edit|preferences|advanced|proxies. This allows you to test to make sure tor is installed correctly. + (If you have a personal firewall, be sure to allow connections to + localhost port 9050.) 7) make sure you've set it up correctly: go to http://www.junkbusters.com/cgi-bin/privacy and see what IP it says you're coming from. If it works, you should probably go on to step 8, @@ -22,6 +24,23 @@ Quickstart version for users: no socks proxy). This step will give you good html scrubbing as well. (See doc/CLIENTS for why direct socks gives you less anonymity.) -If this works for you, you can stop reading. Otherwise, see the README for -more details. +*****If this works for you, you can stop reading here****** + +If you got the source from cvs: + + Run "./autogen.sh", which will run the various auto* programs and then + run ./configure for you. From there, start at step 3 in the quickstart + list above. + +If the quickstart doesn't work for you: + + If you have problems finding libraries, try + CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib" \ + ./configure + rather than simply ./configure. + + Check out the list archives at http://archives.seul.org/or/dev/ and see + if somebody else has reported your problem. If not, please subscribe + and let us know what you did to fix it, or give us the details and + we'll see what we can do. diff --git a/README b/README index 54bb6cfbc..8fe1bebbc 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ http://archives.seul.org/or/dev/. Is your question in the FAQ? Should it be? ************************************************************************** -See the INSTALL file for a quickstart. This is all you will probably need. +See the INSTALL file for a quickstart. That is all you will probably need. ************************************************************************** ************************************************************************** @@ -15,32 +15,6 @@ You only need to look beyond this point if the quickstart in the INSTALL doesn't work for you. ************************************************************************** -Dependencies: - - For tor itself, you're going to need openssl (0.9.5 or later - -- including the dev stuff and includes). If you're on Linux, - everything will probably work fine. OS X and BSD (but see below under - troubleshooting) may work too. Let us know if you get it working - elsewhere. - -If you got the source from cvs: - - Run "./autogen.sh", which will run the various auto* programs and then - run ./configure for you. From there, start at step 3 in the quickstart - list above. - -If the quickstart doesn't work for you: - - If you have problems finding libraries, try - CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib" \ - ./configure - rather than simply ./configure. - - Check out the list archives at http://archives.seul.org/or/dev/ and see - if somebody else has reported your problem. If not, please subscribe - and let us know what you did to fix it, or give us the details and - we'll see what we can do. - Do you want to run a tor server? First, set up a config file for your node (start with sample-orrc and diff --git a/configure.in b/configure.in index d0dddc4ac..bac5ced84 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT -AM_INIT_AUTOMAKE(tor, 0.0.2pre9) +AM_INIT_AUTOMAKE(tor, 0.0.2pre10) AM_CONFIG_HEADER(orconfig.h) CFLAGS="-Wall -O2 -I/usr/kerberos/include" diff --git a/doc/CLIENTS b/doc/CLIENTS index 16177fb5d..2cf4f1f51 100644 --- a/doc/CLIENTS +++ b/doc/CLIENTS @@ -43,15 +43,15 @@ socks server is a tor process (running either locally or elsewhere). In general this works quite well for command-line processes like finger, ssh, etc. But there are a couple of catches: A) tsocks doesn't intercept calls to gethostbyname. So unless you specify an IP rather than hostname, -you'll be giving yourself away. B) Programs which are suid root (or -anybody else) don't let you intercept the system calls -- ssh falls into -this category. But you can make a local copy of ssh and use that. C) -Probably tsocks doesn't behave well for behemoths like Mozilla. +you'll be giving yourself away. B) Programs which are suid don't let you +intercept the system calls -- ssh falls into this category. But you can +make a local copy of ssh and use that. C) Probably tsocks doesn't behave +well for behemoths like Mozilla. Part three: applications which support tor correctly -http: Mozilla: set your socks4 proxy to be the onion proxy +http: Mozilla: set your socks4 proxy to be the onion proxy (but see above) privoxy: set your socks4a proxy to be the onion proxy ssh: tsocks ssh arma@18.244.0.188 ftp: tsocks wget ftp://18.244.0.188/quux.tar --passive diff --git a/src/or/config.c b/src/or/config.c index bf0a59ca7..6c57a39fe 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -197,7 +197,7 @@ int getconfig(int argc, char **argv, or_options_t *options) { /* give reasonable values for each option. Defaults to zero. */ memset(options,0,sizeof(or_options_t)); - options->LogLevel = "debug"; + options->LogLevel = "info"; options->loglevel = LOG_DEBUG; options->DataDirectory = NULL; options->CoinWeight = 0.1; @@ -243,7 +243,7 @@ int getconfig(int argc, char **argv, or_options_t *options) { if(options->LogLevel) { if(!strcmp(options->LogLevel,"err")) options->loglevel = LOG_ERR; - else if(!strcmp(options->LogLevel,"warning")) + else if(!strncmp(options->LogLevel,"warn",4)) options->loglevel = LOG_WARNING; else if(!strcmp(options->LogLevel,"info")) options->loglevel = LOG_INFO; diff --git a/src/or/onion.c b/src/or/onion.c index 84d70df40..59149034e 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -220,7 +220,7 @@ static unsigned int *new_route(double cw, routerinfo_t **rarray, int rarray_len, oldchoice = rarray_len; for(i=0;i<*routelen;i++) { - log_fn(LOG_DEBUG,"Choosing hop %u.",i); +// log_fn(LOG_DEBUG,"Choosing hop %u.",i); if (CRYPTO_PSEUDO_RAND_INT(choice)) { free((void *)route); return NULL;