[or-cvs] r16046: Tor 0.2.0.30. Also, removed dns-proxy-tor as we can use Tor' (in incognito/trunk: portage.overlay/net-misc portage.overlay/net-misc/tor portage.overlay/net-misc/tor/files root_overlay/etc/conf.d root_overlay/etc/tor)

anonym at seul.org anonym at seul.org
Fri Jul 18 12:20:32 UTC 2008


Author: anonym
Date: 2008-07-18 08:20:32 -0400 (Fri, 18 Jul 2008)
New Revision: 16046

Added:
   incognito/trunk/portage.overlay/net-misc/tor/files/torrc.sample.patch
   incognito/trunk/portage.overlay/net-misc/tor/tor-0.2.0.30.ebuild
Removed:
   incognito/trunk/portage.overlay/net-misc/tor/files/tor-cookieperm.patch
   incognito/trunk/portage.overlay/net-misc/tor/files/torrc.sample-0.1.2.6.patch
   incognito/trunk/portage.overlay/net-misc/tor/tor-0.1.2.19-r2.ebuild
   incognito/trunk/portage.overlay/net-misc/trans-proxy-tor/
   incognito/trunk/root_overlay/etc/conf.d/dns-proxy-tor
Modified:
   incognito/trunk/portage.overlay/net-misc/tor/Manifest
   incognito/trunk/portage.overlay/net-misc/tor/files/tor.logrotate.patch
   incognito/trunk/root_overlay/etc/tor/torrc
Log:
Tor 0.2.0.30. Also, removed dns-proxy-tor as we can use Tor's built-in DNS server now.


Modified: incognito/trunk/portage.overlay/net-misc/tor/Manifest
===================================================================
--- incognito/trunk/portage.overlay/net-misc/tor/Manifest	2008-07-18 12:17:33 UTC (rev 16045)
+++ incognito/trunk/portage.overlay/net-misc/tor/Manifest	2008-07-18 12:20:32 UTC (rev 16046)
@@ -1,6 +1,5 @@
-AUX tor-cookieperm.patch 5965 RMD160 c8a0616686bba7a1059c3f9a56508b6c8b6087c3 SHA1 3e323b69e06dca3a4bfd7f07f6396fd04769eaa1 SHA256 7d778566cc2f251506165c7e26e0ef43fd4133dee6e75bf46cfa73b8412ae929
 AUX tor.initd-r3 1568 RMD160 ed03ef5176615af9867af3041fdf24851cd8d14a SHA1 0722b36a30466bf9003b45da3aff7d0298cce4b6 SHA256 c65f92c3eddc1d056eebb948935abb236a235a38ededa1fbd2012f76da7f0241
-AUX tor.logrotate.patch 301 RMD160 47a096ae4e7ddabdd5974df3c8cd1b221641edbb SHA1 b3c158d27b23600cc87f5e0a2ebba732e5fe3f69 SHA256 e64ff0f7442a180bcc8f9bd5fc258058ceae227847e32b69de39b589236f09dc
-AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
-DIST tor-0.1.2.19.tar.gz 1264275 RMD160 4f1b5474a4bbad2e3c82ef0fce2dd838907e48d5 SHA1 5022dab0de2499e2c6638e1a2e9eee6c79fb707c SHA256 7e57198a0858f5ba8651d75225248c85b619e905f0ff4dbb45fffa2d03a1aa61
-EBUILD tor-0.1.2.19-r2.ebuild 1791 RMD160 6df4974c9a94a1d83068f0e5c921177fd27dfac7 SHA1 c8e1457dbf2b0b1fe521571399dd08665e541ef1 SHA256 a074cccc1b49df862e9902dbe691f587281c0a278618f491785a01a08810ca40
+AUX tor.logrotate.patch 407 RMD160 4609a2cf333542b604a0451d189cb2f5a0d4c941 SHA1 105600b903c86ea3a6b770fd7b0bab63501fd945 SHA256 34cd372f813169cb85cd57c2997ecefa87a34e949e60d9365bae7aa6a42e8b64
+AUX torrc.sample.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
+DIST tor-0.2.0.30.tar.gz 2155463 RMD160 e51a38aa1531076bc9722e1584403f917d207dd0 SHA1 c6fbb3bf0141f4b34cc90845373b3dfa8b47ddc4 SHA256 bc9e8bf841ef64f8b06eef91eeab430f91147a3c4d7a6919826fa33b20453387
+EBUILD tor-0.2.0.30.ebuild 1535 RMD160 09986b8f5871fa0c3196d95ca94d2ea1fb02ab3f SHA1 2545e38d07693c1808b5e120ad85c3f7250d6007 SHA256 7bb35ddc3a20bcad5fd911977c6f19a7dbacb23f6b50c777939f16aefb2fd66f

Deleted: incognito/trunk/portage.overlay/net-misc/tor/files/tor-cookieperm.patch
===================================================================
--- incognito/trunk/portage.overlay/net-misc/tor/files/tor-cookieperm.patch	2008-07-18 12:17:33 UTC (rev 16045)
+++ incognito/trunk/portage.overlay/net-misc/tor/files/tor-cookieperm.patch	2008-07-18 12:20:32 UTC (rev 16046)
@@ -1,131 +0,0 @@
-diff -ur tor-0.1.2.18.orig/ChangeLog tor-0.1.2.18/ChangeLog
---- tor-0.1.2.18.orig/ChangeLog	2007-08-29 03:29:21.000000000 -0500
-+++ tor-0.1.2.18/ChangeLog	2007-09-24 04:27:30.000000000 -0500
-@@ -20,12 +20,19 @@
-       they've been around longer than SocksTimeout. Right now there are
-       some cases where the stream will live forever, demanding a new
-       circuit every 15 seconds. Fixes bug 454; reported by lodger.
-+    - Stop putting the authentication cookie in a file called "0"
-+      in your working directory if you don't specify anything for the
-+      new CookieAuthFile option. Reported by Matt Edman.
-+
- 
-   o Minor features (controller):
-     - Add a PROTOCOLINFO controller command. Like AUTHENTICATE, it
-       is valid before any authentication has been received. It tells
-       a controller what kind of authentication is expected, and what
-       protocol is spoken. Implements proposal 119.
-+    - Implement options to allow the controller to pick a new location for
-+      the cookie authentication file, and to make it group-readable.
-+
- 
-   o Minor bugfixes (performance):
-     - Save on most routerlist_assert_ok() calls in routerlist.c, thus
-Only in tor-0.1.2.18: ChangeLog.orig
-diff -ur tor-0.1.2.18.orig/doc/tor.1.in tor-0.1.2.18/doc/tor.1.in
---- tor-0.1.2.18.orig/doc/tor.1.in	2007-05-24 19:51:42.000000000 -0500
-+++ tor-0.1.2.18/doc/tor.1.in	2007-09-24 04:26:21.000000000 -0500
-@@ -119,10 +119,23 @@
- If this option is set to 1, don't allow any connections on the control port
- except when the connecting process knows the contents of a file named
- "control_auth_cookie", which Tor will create in its data directory.  This
--authentication methods should only be used on systems with good filesystem
-+authentication method should only be used on systems with good filesystem
- security. (Default: 0)
- .LP
- .TP
-+\fBCookieAuthFile \fR\fIPath\fP
-+If set, this option overrides the default location and file name for Tor's
-+cookie file.  (See CookieAuthentication above.)
-+.LP
-+.TP
-+\fBCookieAuthFileGroupReadable \fR\fB0\fR|\fB1\R|\fIGroupName\fP
-+If this option is set to 0, don't allow the filesystem group to read
-+the cookie file.  If the option is set to 1, make the cookie file
-+readable by the default GID.  [Making the file readable by other
-+groups is not yet implemented; let us know if you need this for some
-+reason.]  (Default: 0).
-+.LP
-+.TP
- \fBDataDirectory \fR\fIDIR\fP
- Store working data in DIR (Default: @LOCALSTATEDIR@/lib/tor)
- .LP
-@@ -1057,7 +1070,10 @@
- .LP
- .TP
- .B \fIDataDirectory\fP/control_auth_cookie
--Used for cookie authentication with the controller. Regenerated on startup.  See control-spec.txt for details.  Only used when cookie authentication is enabled.
-+Used for cookie authentication with the controller. Location can be
-+overridden by the CookieAuthFile config option. Regenerated on startup.
-+See control-spec.txt for details.  Only used when cookie authentication
-+is enabled.
- .LP
- .TP
- .B \fIDataDirectory\fP/keys/*
-Only in tor-0.1.2.18/doc: tor.1.in.orig
-diff -ur tor-0.1.2.18.orig/src/or/config.c tor-0.1.2.18/src/or/config.c
---- tor-0.1.2.18.orig/src/or/config.c	2007-08-25 16:42:32.000000000 -0500
-+++ tor-0.1.2.18/src/or/config.c	2007-09-24 04:26:21.000000000 -0500
-@@ -143,6 +143,8 @@
-   VAR("ControlListenAddress",LINELIST, ControlListenAddress, NULL),
-   VAR("ControlPort",         UINT,     ControlPort,          "0"),
-   VAR("CookieAuthentication",BOOL,     CookieAuthentication, "0"),
-+  VAR("CookieAuthFileGroupReadable",BOOL,CookieAuthFileGroupReadable, "0"),
-+  VAR("CookieAuthFile",      STRING,   CookieAuthFile,       "0"),
-   VAR("DataDirectory",       STRING,   DataDirectory,        NULL),
-   OBSOLETE("DebugLogFile"),
-   VAR("DirAllowPrivateAddresses",BOOL, DirAllowPrivateAddresses, NULL),
-Only in tor-0.1.2.18/src/or: config.c.orig
-diff -ur tor-0.1.2.18.orig/src/or/control.c tor-0.1.2.18/src/or/control.c
---- tor-0.1.2.18.orig/src/or/control.c	2007-08-22 02:59:58.000000000 -0500
-+++ tor-0.1.2.18/src/or/control.c	2007-09-24 04:25:26.000000000 -0500
-@@ -3301,11 +3301,16 @@
- static char *
- get_cookie_file(void)
- {
--  const char *datadir = get_options()->DataDirectory;
--  size_t len = strlen(datadir)+64;
--  char *fname = tor_malloc(len);
--  tor_snprintf(fname, len, "%s"PATH_SEPARATOR"control_auth_cookie", datadir);
--  return fname;
-+  or_options_t *options = get_options();
-+  if (options->CookieAuthFile && strlen(options->CookieAuthFile)) {
-+    return tor_strdup(options->CookieAuthFile);
-+  } else {
-+    const char *datadir = get_options()->DataDirectory;
-+    size_t len = strlen(datadir)+64;
-+    char *fname = tor_malloc(len);
-+    tor_snprintf(fname, len, "%s"PATH_SEPARATOR"control_auth_cookie", datadir);
-+    return fname;
-+  }
- }
- 
- /** Choose a random authentication cookie and write it to disk.
-@@ -3335,6 +3340,13 @@
-     tor_free(fname);
-     return -1;
-   }
-+#ifndef MS_WINDOWS
-+  if (get_options()->CookieAuthFileGroupReadable) {
-+    if (chmod(fname, 0640)) {
-+      log_warn(LD_FS,"Unable to make %s group-readable.", escaped(fname));
-+    }
-+  }
-+#endif
- 
-   tor_free(fname);
-   return 0;
-Only in tor-0.1.2.18/src/or: control.c.orig
-diff -ur tor-0.1.2.18.orig/src/or/or.h tor-0.1.2.18/src/or/or.h
---- tor-0.1.2.18.orig/src/or/or.h	2007-08-25 16:42:32.000000000 -0500
-+++ tor-0.1.2.18/src/or/or.h	2007-09-24 04:25:26.000000000 -0500
-@@ -1752,6 +1752,8 @@
-                                 * the control system. */
-   int CookieAuthentication; /**< Boolean: do we enable cookie-based auth for
-                              * the control system? */
-+  char *CookieAuthFile; /**< Location of a cookie authentication file. */
-+  int CookieAuthFileGroupReadable; /**< Boolean: Is the CookieAuthFile g+r? */
-   int LeaveStreamsUnattached; /**< Boolean: Does Tor attach new streams to
-                           * circuits itself (0), or does it expect a controller
-                           * to cope? (1) */
-Only in tor-0.1.2.18/src/or: or.h.orig

Modified: incognito/trunk/portage.overlay/net-misc/tor/files/tor.logrotate.patch
===================================================================
--- incognito/trunk/portage.overlay/net-misc/tor/files/tor.logrotate.patch	2008-07-18 12:17:33 UTC (rev 16045)
+++ incognito/trunk/portage.overlay/net-misc/tor/files/tor.logrotate.patch	2008-07-18 12:20:32 UTC (rev 16046)
@@ -1,10 +1,11 @@
---- contrib/tor.logrotate.in.ori	2007-05-31 10:38:24.774901656 +0100
-+++ contrib/tor.logrotate.in	2007-05-31 10:38:52.189956005 +0100
+diff -Nur tor-0.2.0.30.ori/contrib/tor.logrotate.in tor-0.2.0.30/contrib/tor.logrotate.in
+--- tor-0.2.0.30.ori/contrib/tor.logrotate.in	2008-07-18 02:36:56.000000000 +0200
++++ tor-0.2.0.30/contrib/tor.logrotate.in	2008-07-18 02:37:12.000000000 +0200
 @@ -7,6 +7,6 @@
  	notifempty
  	sharedscripts
  	postrotate
--		/etc/rc.d/init.d/tor reload > /dev/null
-+		/etc/rc.d/init.d/tor reload > /dev/null || true
+-		/etc/init.d/tor reload > /dev/null
++		/etc/init.d/tor reload > /dev/null || true
  	endscript
  }

Deleted: incognito/trunk/portage.overlay/net-misc/tor/files/torrc.sample-0.1.2.6.patch
===================================================================
--- incognito/trunk/portage.overlay/net-misc/tor/files/torrc.sample-0.1.2.6.patch	2008-07-18 12:17:33 UTC (rev 16045)
+++ incognito/trunk/portage.overlay/net-misc/tor/files/torrc.sample-0.1.2.6.patch	2008-07-18 12:20:32 UTC (rev 16046)
@@ -1,30 +0,0 @@
---- src/config/torrc.sample.in.orig	2007-01-27 23:41:23.000000000 +0000
-+++ src/config/torrc.sample.in	2007-01-27 23:43:47.000000000 +0000
-@@ -18,6 +18,11 @@
- ## With the default Mac OS X installer, Tor will look in ~/.tor/torrc or
- ## /Library/Tor/torrc
- 
-+## Default username and group the server will run as
-+User tor
-+Group tor
-+
-+PIDFile /var/run/tor/tor.pid
- 
- ## Replace this with "SocksPort 0" if you plan to run Tor only as a
- ## server, and not make any local application connections yourself.
-@@ -46,6 +51,7 @@
- #Log notice syslog
- ## To send all messages to stderr:
- #Log debug stderr
-+Log notice file /var/log/tor/tor.log
- 
- ## Uncomment this to start the process in the background... or use
- ## --runasdaemon 1 on the command line. This is ignored on Windows;
-@@ -55,6 +61,7 @@
- ## 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.
- #DataDirectory @LOCALSTATEDIR@/lib/tor
-+DataDirectory   /var/lib/tor/data
- 
- ## The port on which Tor will listen for local connections from Tor
- ## controller applications, as documented in control-spec.txt.

Copied: incognito/trunk/portage.overlay/net-misc/tor/files/torrc.sample.patch (from rev 15137, incognito/trunk/portage.overlay/net-misc/tor/files/torrc.sample-0.1.2.6.patch)
===================================================================
--- incognito/trunk/portage.overlay/net-misc/tor/files/torrc.sample.patch	                        (rev 0)
+++ incognito/trunk/portage.overlay/net-misc/tor/files/torrc.sample.patch	2008-07-18 12:20:32 UTC (rev 16046)
@@ -0,0 +1,30 @@
+--- src/config/torrc.sample.in.orig	2007-01-27 23:41:23.000000000 +0000
++++ src/config/torrc.sample.in	2007-01-27 23:43:47.000000000 +0000
+@@ -18,6 +18,11 @@
+ ## With the default Mac OS X installer, Tor will look in ~/.tor/torrc or
+ ## /Library/Tor/torrc
+ 
++## Default username and group the server will run as
++User tor
++Group tor
++
++PIDFile /var/run/tor/tor.pid
+ 
+ ## Replace this with "SocksPort 0" if you plan to run Tor only as a
+ ## server, and not make any local application connections yourself.
+@@ -46,6 +51,7 @@
+ #Log notice syslog
+ ## To send all messages to stderr:
+ #Log debug stderr
++Log notice file /var/log/tor/tor.log
+ 
+ ## Uncomment this to start the process in the background... or use
+ ## --runasdaemon 1 on the command line. This is ignored on Windows;
+@@ -55,6 +61,7 @@
+ ## 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.
+ #DataDirectory @LOCALSTATEDIR@/lib/tor
++DataDirectory   /var/lib/tor/data
+ 
+ ## The port on which Tor will listen for local connections from Tor
+ ## controller applications, as documented in control-spec.txt.

Deleted: incognito/trunk/portage.overlay/net-misc/tor/tor-0.1.2.19-r2.ebuild
===================================================================
--- incognito/trunk/portage.overlay/net-misc/tor/tor-0.1.2.19-r2.ebuild	2008-07-18 12:17:33 UTC (rev 16045)
+++ incognito/trunk/portage.overlay/net-misc/tor/tor-0.1.2.19-r2.ebuild	2008-07-18 12:20:32 UTC (rev 16046)
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.2.19-r2.ebuild,v 1.6 2008/05/29 09:51:08 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://tor.eff.org"
-MY_PV=${PV/_/-}
-SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug logrotate"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-1.2"
-RDEPEND="${DEPEND}
-	net-proxy/tsocks"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/tor.logrotate.patch
-	epatch "${FILESDIR}"/tor-cookieperm.patch
-}
-
-src_compile() {
-	econf $(use_enable debug)
-	emake || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r3 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/*.txt
-
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
-
-	if use logrotate; then
-		sed -e "s:/lib::" \
-			-e "s:/rc.d::" \
-			-e "s:\\*:\\*.:" \
-			-e "s:sharedscripts:create 0640 tor tor\n\tsharedscripts:" -i contrib/tor.logrotate || die
-		insinto /etc/logrotate.d
-		newins contrib/tor.logrotate tor
-	fi
-}
-
-pkg_postinst() {
-	elog "You must create /etc/tor/torrc, you can use the sample that is in that directory"
-	elog "To have privoxy and tor working together you must add:"
-	elog "forward-socks4a / localhost:9050 ."
-	elog "(notice the . at the end of the line)"
-	elog "to /etc/privoxy/config"
-}

Added: incognito/trunk/portage.overlay/net-misc/tor/tor-0.2.0.30.ebuild
===================================================================
--- incognito/trunk/portage.overlay/net-misc/tor/tor-0.2.0.30.ebuild	                        (rev 0)
+++ incognito/trunk/portage.overlay/net-misc/tor/tor-0.2.0.30.ebuild	2008-07-18 12:20:32 UTC (rev 16046)
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org"
+MY_PV=${PV/_/-}
+SRC_URI="http://tor.eff.org/dist/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+RDEPEND="${DEPEND}
+	net-proxy/tsocks"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/torrc.sample.patch
+	epatch "${FILESDIR}"/tor.logrotate.patch
+}
+
+src_compile() {
+	econf $(use_enable debug)
+	emake || die "emake failed"
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r3 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog AUTHORS ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/*.txt
+
+	fperms 750 /var/lib/tor /var/log/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+
+	sed -i -e "s:/lib::" \
+		-e "s:/rc.d::" \
+		-e "s:\\*:\\*.:" contrib/tor.logrotate
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+}
+
+pkg_postinst() {
+	elog "You must create /etc/tor/torrc, you can use the sample that is in that directory"
+	elog "To have privoxy and tor working together you must add:"
+	elog "forward-socks4a / localhost:9050 ."
+	elog "(notice the . at the end of the line)"
+	elog "to /etc/privoxy/config"
+}

Deleted: incognito/trunk/root_overlay/etc/conf.d/dns-proxy-tor
===================================================================
--- incognito/trunk/root_overlay/etc/conf.d/dns-proxy-tor	2008-07-18 12:17:33 UTC (rev 16045)
+++ incognito/trunk/root_overlay/etc/conf.d/dns-proxy-tor	2008-07-18 12:20:32 UTC (rev 16046)
@@ -1,26 +0,0 @@
-# Configuration file for dns-proxy-tor.
-# See perldoc dns-proxy-tor for details.
-
-# SOCKS address of Tor
-# Setting this causes dns-proxy-tor to resolve to real IP addresses. Otherwise
-# an virtual network address is returned that only Tor understands.
-SOCKS_ADDRESS="127.0.0.1:9050"
-
-# Bind address
-BIND_ADDRESS="lo:8853"
-
-# Tor controller address
-TOR_ADDRESS="127.0.0.1:9051"
-
-# Tor CookieAuthentication directory. See perldoc.
-TOR_COOKIE_AUTH="/var/tor"
-
-# Password specified in torrc using HashedControlPassword
-#TOR_PASSWORD=""
-
-# Log level: warn, notice, info, debug
-LOG_LEVEL="info"
-
-# Options to pass directly to dns-proxy-tor.
-OPTS=""
-

Modified: incognito/trunk/root_overlay/etc/tor/torrc
===================================================================
--- incognito/trunk/root_overlay/etc/tor/torrc	2008-07-18 12:17:33 UTC (rev 16045)
+++ incognito/trunk/root_overlay/etc/tor/torrc	2008-07-18 12:20:32 UTC (rev 16046)
@@ -21,6 +21,10 @@
 ORPort 9001
 DirPort 9030
 
+DNSPort 8853 # pdnsd forwards lookups to this port
+AutomapHostsOnResolve 1
+AutomapHostsSuffixes .exit,.onion
+
 VirtualAddrNetwork 127.192.0.0/10
 
 ExitPolicy reject *:* # middleman only -- no exits allowed
@@ -30,4 +34,3 @@
 CookieAuthentication 1
 CookieAuthFile /var/tor/control_auth_cookie
 CookieAuthFileGroupReadable 1
-



More information about the tor-commits mailing list