Commit Graph

96 Commits

Author SHA1 Message Date
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
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
Andrew Lewman
280dc1f9c7 change Bytes to B to fix ticket 1195. 2010-06-10 11:36:33 -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
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
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
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
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
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
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
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
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
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
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
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