Upgrade tor to 0.2.0.28-rc (#3660)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@11680 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-07-06 10:46:00 +00:00
parent 07ac1fcea7
commit 61a9af6c16
2 changed files with 94 additions and 77 deletions

View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=tor PKG_NAME:=tor
PKG_VERSION:=0.2.0.26-rc PKG_VERSION:=0.2.0.28-rc
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.torproject.org/dist/ PKG_SOURCE_URL:=http://www.torproject.org/dist/
PKG_MD5SUM:=aa1179fab4dc69a10278e70729681053 PKG_MD5SUM:=d65dd5c9e1f82912aa0c736c5daec22d
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

View File

@ -1,76 +1,67 @@
## Configuration file for a typical tor user ## Configuration file for a typical Tor user
## Built for Tor version 0.1.0.8-rc ## Last updated 22 December 2007 for Tor 0.2.0.14-alpha.
## (May or may not work for older or newer versions of Tor.) ## (May or may not work for much older or much newer versions of Tor.)
# ##
# On Unix, Tor will look for this file in someplace like "~/.tor/torrc" or ## Lines that begin with "## " try to explain what's going on. Lines
# "/etc/torrc" ## that begin with just "#" are disabled commands: you can enable them
# ## by removing the "#" symbol.
# On Windows, Tor will look for the configuration file in someplace like ##
# "Application Data\tor\torrc" or "Application Data\<username>\tor\torrc" ## See the man page, or https://www.torproject.org/tor-manual-dev.html,
# ## for more options you can use in this file.
# With the default Mac OS X installer, Tor will look in ~/.tor/torrc or ##
# /Library/Tor/torrc ## Tor will look for this file in various places based on your platform:
## http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#torrc
## Replace this with "SocksPort 0" if you plan to run Tor only as a ## Replace this with "SocksPort 0" if you plan to run Tor only as a
## server, and not make any local application connections yourself. ## server, and not make any local application connections yourself.
SocksPort 9050 # what port to open for local application connections SocksPort 9050 # what port to open for local application connections
SocksBindAddress 127.0.0.1 # accept connections only from localhost SocksListenAddress 127.0.0.1 # accept connections only from localhost
#SocksBindAddress 192.168.0.1:9100 # listen on a chosen IP/port too #SocksListenAddress 192.168.0.1:9100 # listen on this IP:port also
## Entry policies to allow/deny SOCKS requests based on IP address. ## Entry policies to allow/deny SOCKS requests based on IP address.
## First entry that matches wins. If no SocksPolicy is set, we accept ## First entry that matches wins. If no SocksPolicy is set, we accept
## all (and only) requests from SocksBindAddress. ## all (and only) requests from SocksListenAddress.
#SocksPolicy accept 192.168.0.1/16 #SocksPolicy accept 192.168.0.0/16
#SocksPolicy reject * #SocksPolicy reject *
## Allow no-name routers (ones that the dirserver operators don't
## know anything about) in only these positions in your circuits.
## Other choices (not advised) are entry,exit,introduction.
AllowUnverifiedNodes middle,rendezvous
## Logs go to stdout at level "notice" unless redirected by something ## Logs go to stdout at level "notice" unless redirected by something
## else, like one of the below lines. You can have as many log lines as ## else, like one of the below lines. You can have as many Log lines as
## you want. ## you want.
## ##
## We advise using "notice" in most cases, since anything more verbose
## may provide sensitive information to an attacker who obtains the logs.
##
## Send all messages of level 'notice' or higher to /var/log/tor/notices.log ## Send all messages of level 'notice' or higher to /var/log/tor/notices.log
#Log notice file /var/log/tor/notices.log #Log notice file /var/log/tor/notices.log
## Send only debug and info messages to /var/log/tor/debug.log ## Send every possible message to /var/log/tor/debug.log
#Log debug-info file /var/log/tor/debug.log #Log debug file /var/log/tor/debug.log
## Send ONLY debug messages to /var/log/tor/debug.log ## Use the system log instead of Tor's logfiles
#Log debug-debug file /var/log/tor/debug.log
## To use the system log instead of Tor's logfiles, uncomment these lines:
#Log notice syslog #Log notice syslog
## To send all messages to stderr: ## To send all messages to stderr:
#Log debug stderr #Log debug stderr
## Uncomment this to start the process in the background... or use ## Uncomment this to start the process in the background... or use
## --runasdaemon 1 on the command line. ## --runasdaemon 1 on the command line. This is ignored on Windows;
## see the FAQ entry if you want Tor to run as an NT service.
RunAsDaemon 1 RunAsDaemon 1
## Tor only trusts directories signed with one of these keys, and
## uses the given addresses to connect to the trusted directory
## servers. If no DirServer lines are specified, Tor uses the built-in
## defaults (moria1, moria2, tor26), so you can leave this alone unless
## you need to change it.
#DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441
#DirServer 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF
#DirServer 62.116.124.106:9030 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D
## The directory for keeping all the keys/etc. By default, we store ## The directory for keeping all the keys/etc. By default, we store
## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
DataDirectory /var/lib/tor DataDirectory /var/lib/tor
## The port on which Tor will listen for local connections from Tor controller ## The port on which Tor will listen for local connections from Tor
## applications, as documented in control-spec.txt. NB: this feature is ## controller applications, as documented in control-spec.txt.
## currently experimental.
#ControlPort 9051 #ControlPort 9051
############### This section is just for location-hidden services ### ############### This section is just for location-hidden services ###
## Look in .../hidden_service/hostname for the address to tell people. ## Once you have configured a hidden service, you can look at the
## HiddenServicePort x y:z says to redirect a port x request from the ## contents of the file ".../hidden_service/hostname" for the address
## client to y:z. ## to tell people.
##
## HiddenServicePort x y:z says to redirect requests on port x to the
## address y:z.
#HiddenServiceDir /var/lib/tor/hidden_service/ #HiddenServiceDir /var/lib/tor/hidden_service/
#HiddenServicePort 80 127.0.0.1:80 #HiddenServicePort 80 127.0.0.1:80
@ -78,58 +69,84 @@ DataDirectory /var/lib/tor
#HiddenServiceDir /var/lib/tor/other_hidden_service/ #HiddenServiceDir /var/lib/tor/other_hidden_service/
#HiddenServicePort 80 127.0.0.1:80 #HiddenServicePort 80 127.0.0.1:80
#HiddenServicePort 22 127.0.0.1:22 #HiddenServicePort 22 127.0.0.1:22
#HiddenServiceNodes moria1,moria2
#HiddenServiceExcludeNodes bad,otherbad
################ This section is just for servers ##################### ################ This section is just for relays #####################
#
## See https://www.torproject.org/docs/tor-doc-relay for details.
## NOTE: If you enable these, you should consider mailing your identity ## A unique handle for your server.
## key fingerprint to the tor-ops, so we can add you to the list of
## servers that clients will trust. See
## http://tor.eff.org/doc/tor-doc.html#server for details.
## Required: A unique handle for this server
#Nickname ididnteditheconfig #Nickname ididnteditheconfig
## The IP or fqdn for this server. Leave blank and Tor will guess. ## The IP or FQDN for your server. Leave commented out and Tor will guess.
#Address noname.example.com #Address noname.example.com
## Contact info that will be published in the directory, so we can ## Define these to limit the bandwidth usage of relayed (server)
## contact you if you need to upgrade or if something goes wrong. ## traffic. Your own traffic is still unthrottled.
## This is optional but recommended. ## Note that RelayBandwidthRate must be at least 20 KB.
#RelayBandwidthRate 100 KBytes # Throttle traffic to 100KB/s (800Kbps)
#RelayBandwidthBurst 200 KBytes # But allow bursts up to 200KB/s (1600Kbps)
## Contact info to be published in the directory, so we can contact you
## if your server is misconfigured or something else goes wrong.
#ContactInfo Random Person <nobody AT example dot com> #ContactInfo Random Person <nobody AT example dot com>
## You might also include your PGP or GPG fingerprint if you have one: ## You might also include your PGP or GPG fingerprint if you have one:
#ContactInfo 1234D/FFFFFFFF Random Person <nobody AT example dot com> #ContactInfo 1234D/FFFFFFFF Random Person <nobody AT example dot com>
## Required: what port to advertise for tor connections ## Required: what port to advertise for Tor connections.
#ORPort 9001 #ORPort 9001
## If you want to listen on a port other than the one advertised ## If you need to listen on a port other than the one advertised
## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment ## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment the
## the line below. You'll need to do ipchains or other port forwarding ## line below too. You'll need to do ipchains or other port forwarding
## yourself to make this work. ## yourself to make this work.
#ORBindAddress 0.0.0.0:9090 #ORListenAddress 0.0.0.0:9090
## Uncomment this to mirror the directory for others (please do) ## Uncomment this to mirror directory information for others. Please do
## if you have enough bandwidth.
#DirPort 9030 # what port to advertise for directory connections #DirPort 9030 # what port to advertise for directory connections
## If you want to listen on a port other than the one advertised ## If you need to listen on a port other than the one advertised
## in DirPort (e.g. to advertise 80 but bind 9091), uncomment the line ## in DirPort (e.g. to advertise 80 but bind to 9091), uncomment the line
## below. You'll need to do ipchains or other port forwarding yourself ## below too. You'll need to do ipchains or other port forwarding yourself
## to make this work. ## to make this work.
#DirBindAddress 0.0.0.0:9091 #DirListenAddress 0.0.0.0:9091
## Uncomment this if you run more than one Tor server, and add the
## nickname of each Tor server you control, even if they're on different
## networks. You declare it here so Tor clients can avoid using more than
## one of your servers in a single circuit. See
## http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#MultipleServers
#MyFamily nickname1,nickname2,...
## A comma-separated list of exit policies. They're considered first ## A comma-separated list of exit policies. They're considered first
## to last, and the first match wins. If you want to *replace* ## to last, and the first match wins. If you want to _replace_
## the default exit policy, end this with either a reject *:* or an ## the default exit policy, end this with either a reject *:* or an
## accept *:*. Otherwise, you're *augmenting* (prepending to) the ## accept *:*. Otherwise, you're _augmenting_ (prepending to) the
## default exit policy. Leave commented to just use the default, which is ## default exit policy. Leave commented to just use the default, which is
## available in the man page or at http://tor.eff.org/documentation.html ## available in the man page or at https://www.torproject.org/documentation.html
## ##
## Look at http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#Abuse ## Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
## for issues you might encounter if you use the default exit policy. ## for issues you might encounter if you use the default exit policy.
## ##
## If certain IPs and ports are blocked externally, e.g. by your firewall,
## you should update your exit policy to reflect this -- otherwise Tor
## users will be told that those destinations are down.
##
#ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more #ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more
#ExitPolicy accept *:119 # accept nntp as well as default exit policy #ExitPolicy accept *:119 # accept nntp as well as default exit policy
#ExitPolicy reject *:* # middleman only -- no exits allowed #ExitPolicy reject *:* # no exits allowed
#
################ This section is just for bridge relays ##############
#
## Bridge relays (or "bridges" ) are Tor relays that aren't listed in the
## main directory. Since there is no complete public list of them, even if an
## ISP is filtering connections to all the known Tor relays, they probably
## won't be able to block all the bridges. Unlike running an exit relay,
## running a bridge relay just passes data to and from the Tor network --
## so it shouldn't expose the operator to abuse complaints.
#ORPort 443
#BridgeRelay 1
#RelayBandwidthRate 50KBytes
#ExitPolicy reject *:*
User tor User tor
Group tor Group tor