nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 15:23:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,192 Commits 53 Branches 630 Tags 125 MiB
83b1a50cc0
Commit Graph

248 Commits

Author SHA1 Message Date
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