nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,483 Commits 53 Branches 630 Tags 125 MiB
440eaa9b22
Commit Graph

509 Commits

Author SHA1 Message Date
Nick Mathewson
882fb8383d Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-09 09:45:21 -04:00
Karsten Loesing
66a04a6ac3 Clarify who learns about ContactInfo. 
Explicitly include bridges, and note that we archive and publish all
descriptors.

(We are not yet publishing ContactInfo lines contained in bridge
descriptors, but maybe we'll want to do that soon, so let's err on the
side of caution here.)

Related to #9854.
 2013-10-09 09:43:18 -04:00
Nick Mathewson
57859980a8 Merge remote-tracking branch 'karsten/geoip-manual-update-sep2013' 2013-09-16 12:48:49 -04:00
Nick Mathewson
3892e03cfc Merge remote-tracking branch 'origin/maint-0.2.4' 2013-09-16 12:48:45 -04:00
Nick Mathewson
ace95c525c Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-09-16 12:47:05 -04:00
Nick Mathewson
b46353b793 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-09-16 12:46:50 -04:00
Karsten Loesing
13d192c1d8 Update to the September 2013 GeoIP database. 2013-09-10 15:00:06 +02:00
Karsten Loesing
e7361aa40a Remove 17 now unused manual A1 substitutions. 2013-09-10 14:56:39 +02:00
Nick Mathewson
9abbfef2f7 Merge remote-tracking branch 'karsten/geoip-manual-update-aug2013' 2013-08-12 09:47:30 -04:00
Nick Mathewson
5d706dd27a Merge remote-tracking branch 'origin/maint-0.2.4' 2013-08-12 09:47:17 -04:00
Nick Mathewson
3433b7ce39 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-08-12 09:45:07 -04:00
Nick Mathewson
64410cc888 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-08-12 09:44:36 -04:00
Karsten Loesing
41bf8fa889 Update to the August 2013 GeoIP database. 2013-08-12 15:26:36 +02:00
Karsten Loesing
fa62d966c9 Add 2, update 1, and remove 3 manual A1 substitutions. 2013-08-12 15:22:14 +02:00
Nick Mathewson
dd90ab4121 Merge remote-tracking branch 'karsten/geoip-manual-update-jul2013' 2013-07-08 09:23:39 -04:00
Nick Mathewson
20634fac54 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-07-08 09:23:09 -04:00
Nick Mathewson
c78c8de015 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-07-08 09:22:49 -04:00
Nick Mathewson
0b9c515870 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-07-08 09:22:00 -04:00
Karsten Loesing
2a61b0dd6b Update to the July 2013 GeoIP database. 2013-07-08 10:21:28 +02:00
Karsten Loesing
1a43dfa603 Add 2 new manual A1 substitutions. 2013-07-08 10:14:42 +02:00
Nick Mathewson
bcdc002269 Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013' 2013-06-05 11:22:48 -04:00
Nick Mathewson
7159e19ea9 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-06-05 11:22:36 -04:00
Nick Mathewson
c860a96ecb Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-06-05 11:22:19 -04:00
Nick Mathewson
fe689de084 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-06-05 11:22:02 -04:00
Karsten Loesing
d34753174e Update to the June 2013 GeoIP database. 2013-06-05 08:43:03 +02:00
Karsten Loesing
9b233acd03 Remove 9 now unused manual A1 substitutions. 2013-06-05 08:40:39 +02:00
Nick Mathewson
826daaf726 Merge remote-tracking branch 'karsten/geoip-manual-update-may2013' 2013-05-20 12:42:36 -04:00
Nick Mathewson
c90c370ab3 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-05-20 12:37:58 -04:00
Nick Mathewson
0c2fb64d6f Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-05-20 12:37:21 -04:00
Nick Mathewson
78735f8778 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-05-20 12:34:59 -04:00
Karsten Loesing
f8053179c9 Update to the May 2013 GeoIP database. 2013-05-13 15:37:43 +02:00
Karsten Loesing
d93caf7f0a Update GeoIP file script and manual substitutions. 
Script changes now catch more cases when our manual substitutions need to
be updated.

Manual substitutions are updated to May 2013 database.
 2013-05-13 15:35:01 +02:00
Nick Mathewson
5d4f43eb4a Merge remote-tracking branch 'karsten/geoip-manual-update-apr2013' 2013-04-08 11:10:37 -04:00
Nick Mathewson
1bbfadfa61 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-04-08 11:10:07 -04:00
Nick Mathewson
6acf0ac285 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-04-08 11:09:50 -04:00
Nick Mathewson
9630fb917f Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-04-08 11:09:26 -04:00
Karsten Loesing
b41f03f6df Update to the April 2013 GeoIP database. 2013-04-08 12:18:40 +02:00
Karsten Loesing
c8925550c6 Manually fix 'A1' ranges. 
MaxMind changed twelve 'A1' ranges in their April 2013 database that the
the substitution algorithm couldn't fix.  Fix them manually.
 2013-04-08 12:13:12 +02:00
Nick Mathewson
d89b8e0751 Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013' 2013-03-11 13:34:32 -04:00
Nick Mathewson
ef4db31693 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-03-11 13:32:16 -04:00
Nick Mathewson
c6ca199888 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-03-11 13:32:01 -04:00
Karsten Loesing
3dde6d5d29 Update to the March 2013 GeoIP database. 2013-03-07 20:58:31 +01:00
Karsten Loesing
5cad78c2ce Manually fix yet another fourteen 'A1' ranges. 
MaxMind added fourteen new 'A1' ranges in their March 2013 database that
the automatic substitution algorithm couldn't fix.  Fix them manually.
 2013-03-07 20:55:46 +01:00
Nick Mathewson
fd1c2a13e7 Merge remote-tracking branch 'karsten/geoip-manual-update' 2013-02-08 10:37:34 -05:00
Nick Mathewson
a24f29ec5d Merge remote-tracking branch 'origin/maint-0.2.3' 2013-02-08 10:36:51 -05:00
Nick Mathewson
b840b76b04 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-02-08 10:36:34 -05:00
Karsten Loesing
7f805b6048 Comment out now obsolete change in geoip-manual. 2013-02-08 14:42:07 +01:00
Karsten Loesing
adff7f944a Update to the February 2013 GeoIP database. 2013-02-08 14:39:25 +01:00
Nick Mathewson
cb24852ec5 Merge remote-tracking branch 'origin/maint-0.2.3' 2013-01-14 14:24:53 -05:00
Nick Mathewson
1625cddf3a Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-01-14 14:24:19 -05:00
Karsten Loesing
32114d70ae Update to the January 2013 GeoIP database. 2013-01-05 08:18:26 +01:00
Nick Mathewson
579808d4cd Merge remote-tracking branch 'origin/maint-0.2.3' 
Conflicts:
	src/config/geoip
 2012-12-13 12:52:44 -05:00
Nick Mathewson
52bf1556b1 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2012-12-13 12:51:28 -05:00
Karsten Loesing
6bdfa295b5 Add link explaining how the geoip file was created. 2012-12-13 08:45:25 +01:00
Karsten Loesing
c9a5d613a6 Update to the December 2012 GeoIP database. 2012-12-13 08:44:30 +01:00
Karsten Loesing
d2cfd52d2c Update to the November 2012 GeoIP database. 2012-12-13 08:44:20 +01:00
Karsten Loesing
c718921d34 Update to the December 2012 GeoIP database. 2012-12-06 11:29:47 +01:00
Karsten Loesing
35d09dd6ac Update to the November 2012 GeoIP database. 2012-11-27 21:26:52 -05:00
Karsten Loesing
2bf195d0ce Add script to fix "A1" entries in geoip file. 
Fixes #6266.
 2012-11-27 21:24:07 -05:00
Nick Mathewson
b17aa28e46 Actually distribute the geoip6 file. 
Fixes a bug (with no ticket) on 0.2.4.6-alpha.
 2012-11-13 21:24:28 -05:00
Linus Nordberg
96a7313475 Update geoip6. 2012-10-17 10:54:53 +02:00
Karsten Loesing
c03e3d66a9 Minor tweaks and comments to nils' geoip v6 code. 2012-10-17 10:54:52 +02:00
nils
abb886014e Add GeoIP database for IPv6 addresses 2012-10-17 10:54:52 +02:00
Roger Dingledine
622f90904c 4aff97cfc didn't update the 'last modified' timestamp 2012-09-22 06:11:05 -04:00
Nick Mathewson
45439bfced Revert "6819: typo in torrc.sample.in" 
This reverts commit 4aff97cfc7.

We don't actually want to be changing the torrc.sample on stable or
near-stable stuff, since doing so makes pointless busywork for debian
users.
 2012-09-12 15:37:47 -04:00
Nick Mathewson
6a8861574b Merge remote-tracking branch 'origin/maint-0.2.3' 2012-09-12 11:09:10 -04:00
Nick Mathewson
4aff97cfc7 6819: typo in torrc.sample.in 2012-09-12 11:08:30 -04:00
Stewart Smith
2a4a149624 Move to non-recursive make 
This gives us a few benefits:
1) make -j clean all
   this will start working, as it should. It currently doesn't.
2) increased parallel build
   recursive make will max out at number of files in a directory,
   non-recursive make doesn't have such a limitation
3) Removal of duplicate information in make files,
   less error prone

I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way
that was used was not only deprecated but will be *removed* in the next
major automake release (1.13).... so probably best that we can continue
to bulid tor without requiring old automake.
(see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html )

For more reasons  why, see resources such as:
http://miller.emu.id.au/pmiller/books/rmch/
 2012-08-09 11:03:47 -04:00
Roger Dingledine
5ddb9b3134 Merge branch 'maint-0.2.2' into maint-0.2.3 2012-07-06 16:31:40 -04:00
Roger Dingledine
4e7552e552 Revert to the May 2012 geoip db 
The June 2012 db marks too many relays as country "A1".
Addresses bug 6334.
 2012-07-06 16:29:51 -04:00
Roger Dingledine
068046eebc Merge branch 'maint-0.2.2' 2012-06-13 03:48:43 -04:00
Karsten Loesing
229abbf4bb Update to the June 2012 GeoIP database. 
Manually removed range 0.116.0.0 to 0.119.255.255 which Maxmind says is
assigned to AT.  This is very likely a bug in their database, because
0.0.0.0/8 is a reserved range.
 2012-06-13 09:21:00 +02:00
Nick Mathewson
92cba63459 Merge remote-tracking branch 'origin/maint-0.2.2' 2012-05-15 10:01:12 -04:00
Nick Mathewson
f1fca8aa4d Remove the unused torrc.bridge.in. Bug 5622. 2012-05-14 12:37:39 -04:00
Karsten Loesing
24731ce6a7 Update to the May 2012 GeoIP database. 2012-05-07 12:50:47 +02:00
Roger Dingledine
770433f194 update the torrc.sample timestamp, and clarify socksport 0 2012-04-23 03:10:40 -04:00
Roger Dingledine
6718b6e781 Merge remote-tracking branch 'nickm/bug5438' 2012-04-23 02:03:40 -04:00
Peter Palfrader
5d7fab9477 Document unit of bandwidth related options in sample torrc. 2012-04-13 16:33:36 -04:00
Nick Mathewson
5465ac5ea3 Merge remote-tracking branch 'origin/maint-0.2.2' 2012-04-11 09:26:37 -04:00
Karsten Loesing
b395b59353 Update to the April 2012 GeoIP database. 2012-04-11 14:15:49 +02:00
Daniel 'koolfy' Faucon
116dcf6ca9 Make it clear that bridges should not be set in MyFamily 2012-04-02 18:16:13 -04:00
Nick Mathewson
548f2e32cd Remove the deprecated FooListenAddress options from torrc.sample.in 
Bug 5438.
 2012-03-30 16:53:02 -04:00
Esteban Manchado Velázquez
2a720847ad Fix documentation URLs in config file comments 2012-03-08 20:49:16 -05:00
Nick Mathewson
57ed8fbbdd Merge remote-tracking branch 'origin/maint-0.2.2' 2012-03-08 10:50:33 -05:00
Nick Mathewson
9d5d3a7fd4 Merge remote-tracking branch 'karsten/geoip-march2012' into maint-0.2.2 2012-03-08 10:50:03 -05:00
Karsten Loesing
c5d7ee714f Update to the March 2012 GeoIP database. 2012-03-08 09:35:15 +01:00
Roger Dingledine
ef0bc7f8f2 Merge branch 'maint-0.2.2' 2012-02-09 04:21:20 -05:00
Roger Dingledine
a70ff4b2cb Merge branch 'maint-0.2.1' into maint-0.2.2 2012-02-09 04:21:08 -05:00
Roger Dingledine
6c3cffe450 revert the revert in master, since I didn't want to revert it there 2012-02-09 04:03:36 -05:00
Roger Dingledine
929ebde2b9 Merge branch 'maint-0.2.2' 2012-02-09 04:02:18 -05:00
Roger Dingledine
85c539009a Revert "add a "docs" to the manual URI as listed in torrc.sample.in" 
This reverts commit 55e8cae815.

The conversation from irc:
> weasel: i had intended to leave torrc.sample.in alone in maint-0.2.2,
since i don't want to make all your stable users have to deal with
a torrc change. but nickm changed it. is it in fact the case that a
change in that file means a change in the deb?
<weasel> it means you'll prompt every single user who ever touched
their torrc
<weasel> and they will be asked if they like your new version better
than what they have right now
<weasel> so it's not great

Instead I changed the website to redirect requests for the tor-manual
URL listed in maint-0.2.2's torrc.sample.in so the link will still work.
 2012-02-09 03:57:04 -05:00
Karsten Loesing
4180624a7d Update to the February 2012 GeoIP database. 2012-02-09 09:16:24 +01:00
Nick Mathewson
55e8cae815 add a "docs" to the manual URI as listed in torrc.sample.in 2012-02-08 10:52:05 -05:00
Roger Dingledine
9bcf315e9b Update sample torrc file for 0.2.3.x 
Fix broken URLs.

Tell readers about the OutboundBindAddress, ExitPolicyRejectPrivate,
and PublishServerDescriptor options.
 2012-02-08 04:40:26 -05:00
Roger Dingledine
a1074c7aa2 Merge branch 'maint-0.2.1' into maint-0.2.2 2012-01-05 06:45:28 -05:00
Karsten Loesing
1db1b23a7b Update to the January 2012 GeoIP database. 2012-01-05 11:10:57 +01:00
Roger Dingledine
0582746e0d Merge branch 'maint-0.2.1' into maint-0.2.2 2011-12-08 04:40:15 -05:00
Karsten Loesing
ff2c9acbb3 Update to the December 2011 GeoIP database. 2011-12-08 09:55:44 +01:00
Nick Mathewson
2b7bdc295a Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 2011-11-14 11:10:27 -05:00
Karsten Loesing
6d45c6d548 Update to the November 2011 GeoIP database. 2011-11-07 14:23:48 +01:00
Roger Dingledine
56180d169a Merge branch 'maint-0.2.1' into maint-0.2.2 2011-10-13 10:14:16 -04:00
Karsten Loesing
ee545cd4cb Update to the October 2011 GeoIP database. 2011-10-13 10:13:40 -04:00
Karsten Loesing
679f617345 Update to the September 2011 GeoIP database. 2011-09-15 16:33:36 -04:00
Karsten Loesing
d679ef623f Update to the September 2011 GeoIP database. 2011-09-12 11:43:51 +02:00
Nick Mathewson
f570470830 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 2011-08-08 17:21:21 -04:00
Karsten Loesing
c75ee94ab4 Update to the August 2011 GeoIP database. 2011-08-08 16:57:01 +02:00
Roger Dingledine
8e3830352f Merge branch 'maint-0.2.1' into maint-0.2.2 2011-07-07 13:29:02 -04:00
Roger Dingledine
51d6e95023 update to the july 2011 geoip db 2011-07-07 13:28:36 -04:00
Roger Dingledine
83e3975c8b Merge branch 'maint-0.2.1' into maint-0.2.2 2011-06-05 11:13:50 -04:00
Roger Dingledine
bf4b819aae move to the june 1 2011 maxmind geoip db 2011-06-05 11:12:28 -04:00
Roger Dingledine
7206d784dc Merge branch 'maint-0.2.1' into maint-0.2.2 2011-05-10 23:05:51 -04:00
Roger Dingledine
e7b10e5ecf Update to the May 1 2011 Maxmind GeoLite Country database 2011-05-10 23:04:11 -04:00
Roger Dingledine
9d2b3849b2 Merge branch 'maint-0.2.1' into maint-0.2.2 2011-04-04 03:53:38 -04:00
Roger Dingledine
0cdd262941 switch to the apr 2011 geoip db 2011-04-04 03:52:58 -04:00
Roger Dingledine
6426cd14f3 Merge branch 'maint-0.2.1' into maint-0.2.2 2011-03-08 18:16:06 -05:00
Roger Dingledine
d080fe8db1 move to march 2011 geoip file 2011-03-08 18:15:17 -05:00
Roger Dingledine
54ccc80a4a Merge branch 'maint-0.2.1' into maint-0.2.2 2011-02-07 22:20:35 -05:00
Karsten Loesing
9c2cb6fc89 Update to the February 1 2011 Maxmind GeoLite Country database. 2011-02-07 22:19:37 -05:00
Nick Mathewson
5ae391762c Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 2011-01-10 14:12:33 -05:00
Karsten Loesing
d43cba6c69 Update to the January 1 2011 Maxmind GeoLite Country database. 2011-01-10 10:37:54 +01:00
Nick Mathewson
ddfb398494 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 
Conflicts:
	src/config/geoip
 2010-12-14 14:13:24 -05:00
Karsten Loesing
35148ba532 Update to the December 1 2010 Maxmind GeoLite Country database. 2010-12-08 17:59:40 +01:00
Sebastian Hahn
40fd0c1ca1 Remove the torrc.complete file. 
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-10 15:48:25 +01:00
Roger Dingledine
70411a50b1 move to the november 1 maxmind geoip db 2010-11-06 17:41:36 -04:00
Nick Mathewson
69b4138c00 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 2010-10-04 12:32:35 -04:00
Karsten Loesing
bad609ae6b Update to the October 1 2010 Maxmind GeoLite Country database. 2010-10-04 11:45:53 +02:00
John Brooks
fb34c66e83 Correct default for RendPostPeriod in docs 2010-09-21 01:05:47 -04:00
Nick Mathewson
c05c8dbd78 Merge remote branch 'origin/maint-0.2.1' 2010-09-08 10:59:45 -04:00
Karsten Loesing
80d9dbac20 Update to the September 1 2010 Maxmind GeoLite Country database. 2010-09-08 11:03:26 +02:00
Nick Mathewson
6d8b932659 Merge commit 'origin/maint-0.2.1' 2010-08-03 09:13:17 -04:00
Karsten Loesing
f206209abf Update to the August 1 2010 Maxmind GeoLite Country database. 2010-08-03 13:04:09 +02:00
Sebastian Hahn
f9a4b3e45b Don't put a ControlPort without auth in sample bridge torrc 
Thanks Roger for noticing
 2010-06-10 17:44:36 +02:00
Andrew Lewman
280dc1f9c7 change Bytes to B to fix ticket 1195. 2010-06-10 11:36:33 -04:00
Nick Mathewson
bedb59c034 Merge remote branch 'origin/maint-0.2.1' 2010-06-07 15:10:48 -04:00
Karsten Loesing
f60e4bcdd9 Update to June 1 2010 Maxmind GeoLite Country database. 2010-06-07 15:07:36 -04:00
Andrew Lewman
50afadb74d Sample torrc as a bridge 
On Sun, 6 Jun 2010 19:59:56 -0400
Andrew Lewman <andrew@torproject.org> wrote:

> attached.

let's try this again.

From e95c44bc5af90d982e9d95d63e78b2fde67431ed Mon Sep 17 00:00:00 2001
From: Andrew Lewman <andrew@torproject.org>
Date: Sun, 6 Jun 2010 19:56:16 -0400
Subject: [PATCH] Create a sample bridge configuration torrc.
 2010-06-07 11:05:32 -04:00
Roger Dingledine
89bb5fbce6 Merge branch 'maint-0.2.1' 2010-05-06 07:18:44 -04:00
Roger Dingledine
befcc84f43 move to maxmind geoip db 2010-05-06 07:15:22 -04:00
Sebastian Hahn
0e0c31b1b8 Fix the path to the exit-notice file in torrc.sample 
Also reword it slightly to reflect the fact that no packagers
ship the file.
 2010-02-08 23:36:01 +01:00
Jacob Appelbaum
2aac39a779 Implement DisableAllSwap to avoid putting secret info in page files. 
This commit implements a new config option: 'DisableAllSwap'
This option probably only works properly when Tor is started as root.
We added two new functions: tor_mlockall() and tor_set_max_memlock().
tor_mlockall() attempts to mlock() all current and all future memory pages.
For tor_mlockall() to work properly we set the process rlimits for memory to
RLIM_INFINITY (and beyond) inside of tor_set_max_memlock().
We behave differently from mlockall() by only allowing tor_mlockall() to be
called one single time. All other calls will result in a return code of 1.
It is not possible to change DisableAllSwap while running.
A sample configuration item was added to the torrc.complete.in config file.
A new item in the man page for DisableAllSwap was added.
Thanks to Moxie Marlinspike and Chris Palmer for their feedback on this patch.

Please note that we make no guarantees about the quality of your OS and its
mlock/mlockall implementation. It is possible that this will do nothing at all.
It is also possible that you can ulimit the mlock properties of a given user
such that root is not required. This has not been extensively tested and is
unsupported. I have included some comments for possible ways we can handle
this on win32.
 2009-10-27 04:28:40 -04:00
Roger Dingledine
cbbd6f9263 Revert to the "June 3 2009" ip-to-country file. 
The September one seems to have removed most US IP addresses.
 2009-09-24 19:15:24 -04:00
Roger Dingledine
3ddd7212e6 Update to the "September 4 2009" ip-to-country file. 2009-09-21 01:44:59 -04:00
Roger Dingledine
c0a2d7dc73 Clean up the accountingmax section in torrc.sample 
Also, suggest a default of 4GB/day (46KB/s) rather than 1GB/day (11.5KB/s).
No use asking low.
 2009-07-16 17:15:59 -04:00
Nick Mathewson
82795eebb7 Include AccountingMax in torrc.sample 
"There's room for one more till the end of creation." -- _Sandman_

(Based on patch from David [edeca].  Closes bug 1036.)
 2009-07-16 14:02:07 -04:00
Nick Mathewson
4945fee65a Merge commit 'origin/maint-0.2.1' 2009-06-04 03:31:12 -04:00
Karsten Loesing
48bf1d97ee Update the rest of the geoip file. 2009-06-04 00:47:58 +02:00
Nick Mathewson
0b23035e43 Update the geoip file 2009-06-03 17:35:41 -04:00
Sebastian Hahn
d230827912 Remove all svn metadata minus what I missed. 
Tor doesn't use SVN anymore, making $Revision$, $Id$ and $Date$
meaningless. Remove them without replacement.
 2009-05-05 17:05:46 +02:00
Roger Dingledine
72e4d48c7a Update to the "April 3 2009" ip-to-country file. 
svn:r19307
 2009-04-12 08:09:38 +00:00
Roger Dingledine
115474a44e put HashedControlPassword and CookieAuthentication explicitly in the 
torrc.sample.in, so unix people don't shoot themselves in the foot.


svn:r19304
 2009-04-12 06:45:46 +00:00
Roger Dingledine
0f46c1dc6e Update to the "February 26 2009" ip-to-country file 
svn:r18774
 2009-03-05 10:47:25 +00:00
Roger Dingledine
b03f78e8af Update to the "January 23 2009" ip-to-country file 
svn:r18503
 2009-02-12 12:32:14 +00:00
Roger Dingledine
ec9c059757 give torrc.sample its yearly overhaul. the main change is to 
merge the 'bridge relay' section into the 'main relay'
section, so people stop getting confused about whether they
should fill out both sections (they shouldn't).


svn:r18348
 2009-01-30 19:37:59 +00:00
Roger Dingledine
d1351750ed Update to the "December 19 2008" ip-to-country file 
svn:r17968
 2009-01-06 18:03:01 +00:00
Roger Dingledine
21892d8a9c cleanups on r17500 
svn:r17501
 2008-12-07 01:34:45 +00:00
Jacob Appelbaum
6b178b46ef New DirPortFrontPage option that takes an html file and publishes it as "/" on the DirPort. Now relay operators can provide a disclaimer without needin to set up a separate webserver. There's a sample disclaimer in contrib/tor-exit-notice.html. 
svn:r17500
 2008-12-07 01:21:19 +00:00
Roger Dingledine
29abfab8bf Update to the "September 1 2008" ip-to-country file. 
svn:r16940
 2008-09-23 09:51:05 +00:00
Roger Dingledine
89c903d9aa update to june 9 2008 ip-to-country file 
svn:r15124
 2008-06-11 10:09:30 +00:00
Nick Mathewson
4ead083dbc Do not ship a fallback-consensus until the related bugs are fixed. 
svn:r14794
 2008-05-29 00:54:08 +00:00
Roger Dingledine
a1aeaf3089 say how we generated the geoip file 
svn:r14786
 2008-05-28 21:11:13 +00:00
Nick Mathewson
dd715016dd Fix the rpm build: we need to list all our files in the files section. Also, put fallback-consensus and geoip file in /usr/share/tor/, not in /usr/share/ 
svn:r14778
 2008-05-28 17:15:52 +00:00
Roger Dingledine
7f61dafe8d include the geoip file in the tarball, and load it by default 
when tor starts.
this breaks rpms and maybe other packages.


svn:r14764
 2008-05-28 04:37:34 +00:00
Roger Dingledine
d232d2d188 add a monster geoip file to src/config, so we can ship it with 
all the tors.


svn:r14761
 2008-05-28 04:29:07 +00:00
Roger Dingledine
aac22f1523 revert r13221 (for now) 
svn:r13289
 2008-01-26 01:06:57 +00:00
Roger Dingledine
291c628c28 put the fallback-consensus file back into the tarball. 
this should re-introduce bug 572, and maybe we'll get
some actual bug reports this time.


svn:r13221
 2008-01-21 23:29:04 +00:00
Roger Dingledine
621c50d645 add a 'bridge relay' config section to the sample torrc 
svn:r12937
 2007-12-23 05:08:46 +00:00
Nick Mathewson
2e378295d6 r16997@catbus: nickm | 2007-12-06 18:56:33 -0500 
Make http://torproject urls into https://torproject urls.  Patch from steve.


svn:r12708
 2007-12-06 23:56:36 +00:00
Nick Mathewson
92372b156a r16995@catbus: nickm | 2007-12-06 18:42:53 -0500 
patch from steve: replace more tor.eff.org instances with torproject.org


svn:r12707
 2007-12-06 23:42:59 +00:00
Roger Dingledine
8a1b394695 We were including instructions about what to do with the 
src/config/fallback-consensus file, but we weren't actually 
including it in the tarball. Disable all of that for now.


svn:r12467
 2007-11-11 01:27:02 +00:00
Roger Dingledine
a5ffde659c make it data_DATA too. debugging by random mutation. 
svn:r12463
 2007-11-11 00:30:46 +00:00
Roger Dingledine
33a9f45a86 We weren't actually including the src/config/fallback-consensus 
file in the tarball. Reported by phobos.


svn:r12462
 2007-11-10 23:58:07 +00:00
Nick Mathewson
832ef9562f r14623@tombo: nickm | 2007-11-01 22:25:18 -0400 
More tweaks from karsten, with some cleanup and commentary.


svn:r12319
 2007-11-02 02:25:28 +00:00
Nick Mathewson
f09d53bbf1 r16246@catbus: nickm | 2007-10-28 19:34:58 -0400 
Implement a FallbackNetworkstatusFile (default to $prefix/share/tor/fallback-consensus) to that we know about lots of directory servers and routers when we start up the first time.


svn:r12259
 2007-10-28 23:44:53 +00:00
Roger Dingledine
75bd472869 do another cleanup pass on the sample torrc 
svn:r11168
 2007-08-19 00:59:04 +00:00
Roger Dingledine
622dd4927e change the BandwidthRate/BandwidthBurst in the torrc 
to RelayBandwidthRate/RelayBandwidthBurst, since that's
what most users will actually want. also flesh out the
torrc.complete entries and fix a few typos. based on
patch from "Armedblowfish".


svn:r10570
 2007-06-12 08:19:02 +00:00
Roger Dingledine
64b0d7202e also remove these obsolete torrcs 
svn:r10362
 2007-05-27 06:07:51 +00:00
Roger Dingledine
1ab216eb2f what the heck is this obsolete dirservers file still doing here? 
svn:r10361
 2007-05-27 06:06:01 +00:00
Roger Dingledine
f0d7a6716f In the hidden service example in torrc.sample, stop recommending 
esoteric and discouraged hidden service options.


svn:r8648
 2006-10-08 07:45:16 +00:00
Roger Dingledine
74bf8b1289 man, our sample torrc sucked. 
svn:r6964
 2006-08-01 04:08:15 +00:00
Peter Palfrader
521c006fd5 Remove .cvsignore files from trunk 
svn:r6891
 2006-07-25 01:00:48 +00:00
Roger Dingledine
1f407c174d remove the word 'middleman' from the sample torrc 
svn:r6703
 2006-06-29 13:10:08 +00:00
Roger Dingledine
a4c315f3c3 fix recommended url in torrc.sample for server sign-up 
svn:r6626
 2006-06-15 22:32:00 +00:00
Roger Dingledine
940b0a4d2e write a better note in torrc.sample about whether to set dirport. 
svn:r5978
 2006-02-12 01:12:52 +00:00
Roger Dingledine
2e5bd47555 more cleanups on the sample torrc file 
svn:r5947
 2006-02-09 05:18:03 +00:00
Roger Dingledine
032a01ef64 just because you support the feature does not mean that you 
should put an example in the sample torrc file.

the debug-info lines were causing some people to think that
was a smart loglevel to use, and it also always isn't.


svn:r5905
 2006-02-04 07:45:40 +00:00
Roger Dingledine
1c4822802f take AllowUnverifiedNodes out of the sample torrc 
svn:r5832
 2006-01-17 01:09:58 +00:00
Roger Dingledine
1107c40dc0 mention a recommended log level in the sample torrc file 
svn:r5731
 2006-01-05 10:37:22 +00:00
Roger Dingledine
4f033b0028 make the commenting in the torrc.sample consistent, and try to 
explain in it what comments are.


svn:r5711
 2006-01-03 00:45:12 +00:00
Peter Palfrader
43c253958e Tor26's IP has changed to 86.59.21.38 
svn:r5350
 2005-11-05 20:20:51 +00:00
Roger Dingledine
cb785f7b42 fix a url in the sample torrc 
svn:r5324
 2005-10-27 02:36:52 +00:00
Roger Dingledine
38c6985fff and update the sample torrc to reflect the *listenaddress notation 
svn:r5261
 2005-10-17 03:23:05 +00:00
Nick Mathewson
2d203fdcf3 link nicknames to trusted directory servers; log these nicknames when mentioning servers; also, when we get a naming conflict; log which nicknames or keys are supposed to bind. 
svn:r5184
 2005-10-04 21:21:09 +00:00
Roger Dingledine
31c7f59b25 add MyFamily to the torrc.sample 
svn:r5133
 2005-09-23 20:53:42 +00:00
Nick Mathewson
ebf6476e8e Provide dire warnings to any users who set DirServer; move it out of torrc.sample and into torrc.complete. 
svn:r5132
 2005-09-23 20:44:22 +00:00
Andrew Lewman
955a10fee0 Initial complete config file. Organized into easily searchable 
sections.


svn:r4789
 2005-08-16 02:14:40 +00:00
Roger Dingledine
44fe2fa7eb better log examples in the torrc 
svn:r4646
 2005-07-23 05:14:33 +00:00
Roger Dingledine
495169d316 the abuse faq moved, so change the url 
svn:r4629
 2005-07-22 06:35:25 +00:00
Roger Dingledine
f2bc79ba89 forward-port with a different version claim 
svn:r4608
 2005-07-19 21:16:31 +00:00
Roger Dingledine
867cbf1022 and here too 
svn:r4561
 2005-07-14 22:38:30 +00:00
Roger Dingledine
da7d93e88a make the comment next to RunAsDaemon mention that it is a noop on win32 
svn:r4489
 2005-06-26 08:59:01 +00:00
Roger Dingledine
5bca8e8b4d forward-port: 
## 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.


svn:r4376
 2005-06-09 10:42:25 +00:00
Roger Dingledine
7c8d5c3178 correct some instructions in the sample torrc 
svn:r4314
 2005-06-06 15:57:53 +00:00
Roger Dingledine
78f26e8806 test out commit mails again 
svn:r4281
 2005-05-23 03:39:53 +00:00
Roger Dingledine
ee553a9c72 put a tor version at the top of the torrc.sample file 
svn:r4280
 2005-05-23 03:38:32 +00:00
Roger Dingledine
b7a88ebd15 fix url in comment in torrc 
svn:r4225
 2005-05-15 03:00:00 +00:00
Roger Dingledine
533a3bbe2e don't point to the 0.0.9.x manual only 
svn:r4007
 2005-04-04 18:57:16 +00:00
Roger Dingledine
88c9e3959a put a note in the torrc about abuse potential with the default 
exit policy.


svn:r4006
 2005-04-04 18:56:15 +00:00
Roger Dingledine
452563e157 make slightly clearer that socksport is for local applications 
svn:r3901
 2005-03-27 11:27:16 +00:00
Nick Mathewson
efb5db449a Describe where to find torrc on OS X 
svn:r3889
 2005-03-27 01:11:45 +00:00
Roger Dingledine
5d5b12ce75 make example contactinfo entries slightly more spam resistant, since 
people are seeing spam to their contactinfo addresses now. (yay.)


svn:r3795
 2005-03-21 07:40:25 +00:00
Geoff Goodell
035c8d1b1c added short blurb about ControlPort to sample torrc 
svn:r3790
 2005-03-19 20:50:03 +00:00
Thomas Sjögren
7c29b65466 removing the warning about port 80. 
svn:r3773
 2005-03-18 16:34:56 +00:00
Thomas Sjögren
b1ceb1fb22 add "warning" about port 80 to torrc.sample.in 
svn:r3772
 2005-03-18 16:30:29 +00:00
Thomas Sjögren
932252f9b4 Show people where they can find the default exit policy. 
svn:r3762
 2005-03-14 23:26:41 +00:00
Roger Dingledine
d7cee9dbf4 make the example log-to-file line use log-level notice rather than 
log-level warn.


svn:r3441
 2005-01-28 05:40:41 +00:00
Roger Dingledine
8ebe85333c comment SocksPort better as it pertains to servers 
svn:r3413
 2005-01-22 06:51:31 +00:00
Roger Dingledine
f2a7ff6801 better comments for exit policies in torrc.sample 
svn:r3371
 2005-01-19 17:26:40 +00:00
Roger Dingledine
bd2d740b49 make it clearer why FooPort and FooBindAddress are separate 
svn:r3369
 2005-01-19 06:06:04 +00:00
Roger Dingledine
53c522ee1c make it clearer you can have multiple SocksBindAddress directives 
svn:r3262
 2005-01-03 21:47:59 +00:00
Roger Dingledine
fdf8c55f30 clarify the comments about logs in the torrc 
svn:r3239
 2005-01-02 06:34:58 +00:00
Roger Dingledine
0d7e8660c7 add a comment to explain what ContactInfo is for 
svn:r3236
 2005-01-01 23:58:16 +00:00
Roger Dingledine
ee282fc167 mark nickname and ORPort as the two required fields for servers 
svn:r3156
 2004-12-16 21:36:08 +00:00
Roger Dingledine
1477bf18e7 fix header text of torrc.sample 
svn:r3129
 2004-12-10 19:22:15 +00:00
Roger Dingledine
e0e40e51ae clean up docs a bit for default log lines. 
svn:r3098
 2004-12-07 06:38:41 +00:00
Roger Dingledine
40c97ac504 move the rendezous section of the torrc to the middle, since 
it isn't server-only, and indeed it may be unwise to run a
hidden service on a server.


svn:r2995
 2004-11-27 08:18:22 +00:00
Nick Mathewson
270b942edf Note where torrc goes. 
svn:r2865
 2004-11-14 19:08:08 +00:00
Peter Palfrader
a1e7ad4855 Fix two comments in torrc.sample.in directly in the upstream source 
svn:r2812
 2004-11-12 17:04:42 +00:00
Roger Dingledine
c106ab8315 clean torrc sample 
change log files to end in .log for logrotate to notice
mention that address doesn't need to be defined


svn:r2803
 2004-11-12 04:00:07 +00:00
Roger Dingledine
c41c469166 don't ship with the default dirservers listed explicitly. leave them 
unlisted so we can change the default later.


svn:r2762
 2004-11-10 00:14:02 +00:00
Roger Dingledine
6b22360eb8 fix mistake in comments 
svn:r2723
 2004-11-09 05:30:48 +00:00
Nick Mathewson
f490e5cdb6 Update log documentation 
svn:r2691
 2004-11-05 21:22:38 +00:00
Roger Dingledine
0c583a6cf2 clarify it even better 
svn:r2687
 2004-11-05 11:58:34 +00:00
Roger Dingledine
0ab8b8a4e4 resolve misleading torrc comments 
svn:r2686
 2004-11-05 11:55:35 +00:00
Nick Mathewson
831c988ea1 fix problems introduced by rpm spec patch. 
svn:r2675
 2004-11-04 15:34:04 +00:00
Nick Mathewson
69e5e8d0ad Merge RPM spec patch from jbash 
svn:r2674
 2004-11-04 15:17:22 +00:00
Nick Mathewson
26f3cb8652 Add SysLog option to direct log messages to the system log instead of a FILE*. 
svn:r2591
 2004-10-26 21:48:41 +00:00
Roger Dingledine
56e151eb41 advertise moria2's dirport as 18.244.0.114:80 
svn:r2511
 2004-10-14 10:05:22 +00:00
Roger Dingledine
892269bca3 reformat comment and fix typo 
svn:r2485
 2004-10-14 03:01:43 +00:00
Nick Mathewson
0d5a847f12 Remove need for dirservers file: now, we note trusted dirservers in configuration options, and only need to remember addr:port and key digest for each one. 
svn:r2479
 2004-10-14 01:44:32 +00:00
Roger Dingledine
c205ad05ba better example lines for dirbindaddress and orbindaddress 
svn:r2415
 2004-10-03 19:37:48 +00:00
Roger Dingledine
09f450104a don't imply to people that they should store their hidden service 
keys in /tmp


svn:r2371
 2004-09-23 20:50:27 +00:00
Roger Dingledine
eade496dcd JI hates people who say "IP" when they mean "IP address" 
svn:r2352
 2004-09-12 15:07:14 +00:00
Nick Mathewson
8ab26650ee Fix documentation about how not to be an OP 
svn:r2342
 2004-09-10 18:54:21 +00:00
Roger Dingledine
92a44fddb1 allow unverified nodes in middle and rendezvous positions by default 
svn:r2258
 2004-08-17 08:48:52 +00:00
Roger Dingledine
59a356ea47 clarify sockspolicy, exitpolicy rules 
svn:r2157
 2004-08-06 10:11:57 +00:00
Roger Dingledine
97338cf9a0 update the sample torrc 
svn:r2139
 2004-08-04 06:17:24 +00:00
Roger Dingledine
0536b853fd add a comment asking ORs to configure a DirPort too 
svn:r2104
 2004-07-22 11:16:39 +00:00
Roger Dingledine
0f69fd9954 add an example ContactInfo line to torrc.sample 
svn:r1988
 2004-06-29 19:32:11 +00:00
Roger Dingledine
73d3f3efa5 what is this "command line" that we can allegedly write to? 
svn:r1967
 2004-06-13 11:25:20 +00:00
Roger Dingledine
23c1a72c4c Address can be an IP too 
svn:r1964
 2004-06-10 14:23:34 +00:00