nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 14:43:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,213 Commits 53 Branches 630 Tags 125 MiB
6ee9138576
Commit Graph

3471 Commits

Author SHA1 Message Date
Nick Mathewson
dfc32177d9 Merge remote-tracking branch 'origin/maint-0.2.4' 2014-04-01 21:00:30 -04:00
Nick Mathewson
a68e6ea9c0 Fix documentation of torrc search order 
We are searching @CONFDIR@ before $HOME, but the documentation
implied otherwise.

I screwed this up in f5e86bcd6c, when I
first documented the $HOME/.torrc possibility.

Fix for bug 9213; bugfix on 0.2.3.18-rc.
 2014-04-01 20:56:03 -04:00
Nick Mathewson
91f6a422cc Fix build of torify.1 
The build was broken by changes in f8c45339f7, but we didn't
notice, since that commit also made torify.1 only get built when
tor-fw-helper was turned on.

Fixes bug 11321; bugfix on Tor 0.2.5.1-alpha.
 2014-03-26 12:12:54 -04:00
Nick Mathewson
1a7794e475 Merge remote-tracking branch 'public/bug11061_024' 2014-03-25 10:02:22 -04:00
Nick Mathewson
5e9672904c Fix SOCKSPort documentation layout 
In the end this required a slightly nasty hack using a dummy anchor as
an option heading in order to make the "Other recognized __flags__"
line indent properly.

Fixes bug 11061; Bugfix on 61d740ed.
 2014-03-25 10:01:08 -04:00
Nick Mathewson
f4e2c72bee Merge remote-tracking branch 'karsten/task-11070' 2014-03-23 00:18:48 -04:00
Roger Dingledine
e4c7fdd48c bring hacking more up to date 2014-03-22 23:36:10 -04:00
Nick Mathewson
8a647291c8 extract some changelog principles into doc/HACKING 2014-03-19 20:24:15 -04:00
Karsten Loesing
7450403410 Take out remaining V1 directory code. 2014-03-18 10:40:10 +01:00
Nick Mathewson
9991c5f001 Clarify ClientOnly documentation 
The option is unneeded, not meaningless, so explain what it does.

Patch from Matt Pagan; fixes 9059.
 2014-03-13 10:35:52 -04:00
Nick Mathewson
4a2a1e572e Merge branch 'bug11108' 2014-03-06 10:22:40 -05:00
Nick Mathewson
967d9c9f10 Clarify default behavior of {SOCKS,Dir}Policy harder 
Improvement on 11108 fix; suggested by cypherpunks.
 2014-03-06 10:21:59 -05:00
Nick Mathewson
d3c5df6cf6 Give the HTTPS url for jenkins in doc/HACKING 2014-03-06 10:03:24 -05:00
Nick Mathewson
22ccfc6b5f Rename PredictedCircsRelevanceTime->PredictedPortsRelevanceTime 
All circuits are predictive; it's the ports that are expiring here.
 2014-03-05 14:35:07 -05:00
Nick Mathewson
103cebd924 Merge branch 'ticket9176_squashed' 
Conflicts:
	doc/tor.1.txt
 2014-03-05 14:32:05 -05:00
Nick Mathewson
2c25bb413e Lower the maximum for PrecictedCircsRelevanceTime to one hour 2014-03-05 14:31:13 -05:00
unixninja92
d47d147307 More correctly documented PredictedCircsRelevanceTime in tor.1.txt 2014-03-05 14:31:13 -05:00
unixninja92
52fbb9f623 Added Documentation for PredictedCircsRelevanceTime config file argument. 2014-03-05 14:31:13 -05:00
Nick Mathewson
27d231ca13 Document alternate bandwidth/memory unit spellings 2014-03-04 12:12:36 -05:00
Nick Mathewson
ab225aaf28 Merge branch 'bug10169_025_v2' 
Conflicts:
	src/test/test.c
 2014-03-04 11:03:30 -05:00
Nick Mathewson
4050dfa320 Warn if ports are specified in {Socks,Dir}Policy 
We have ignored any ports listed here since 80365b989 (0.0.7rc1),
but we didn't warn the user that we were ignoring them.  This patch
adds a warning if you put explicit ports in any of the options
{Socks,Dir}Policy or AuthDir{Reject,Invalid,BadDir,BadExit}.  It
also adjusts the manpage to say that ports are ignored.

Fixes ticket 11108.
 2014-03-03 10:45:39 -05:00
Lunar
3a425ac3a8 Fix max client name length in HiddenServiceAuthorizeClient description 
REND_CLIENTNAME_MAX_LEN is set to 16, not 19.
 2014-03-03 09:53:38 -05:00
Karsten Loesing
3ca5fe81e3 Write hashed bridge fingerprint to logs and to disk. 
Implements #10884.
 2014-02-28 08:53:13 -05:00
Nick Mathewson
87fb1e324c Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2 
Conflicts:
	src/or/circuitlist.c
 2014-02-12 12:44:58 -05:00
Roger Dingledine
1ccc282122 add a missing word to the man page 2014-02-12 04:01:59 -05:00
Nick Mathewson
0228b9bd4b Tweak DirAuthority documentation 
Per a comment from karsten, there is no longer v2 authority support,
so stop pretending there is. Also, fix a grammar error.x
 2014-02-11 11:34:32 -05:00
Nick Mathewson
c0483c7f85 Remove options for configuring HS authorities. 
(There is no longer meaningfully any such thing as a HS authority,
since we stopped uploading or downloading v0 hs descriptors in
0.2.2.1-alpha.)

Implements #10881, and part of #10841.
 2014-02-10 22:41:52 -05:00
Nick Mathewson
5991f9a156 TransProxyType replaces TransTPROXY option 
I'm making this change now since ipfw will want its own option too,
and proliferating options here isn't sensible.

(See #10582 and #10267)
 2014-02-03 13:56:19 -05:00
Nick Mathewson
09ccc4c4a3 Add support for TPROXY via new TransTPRoxy option 
Based on patch from "thomo" at #10582.
 2014-01-31 12:59:35 -05:00
Nick Mathewson
6a6bc9da53 Document more coverage tricks in doc/HACKING 2014-01-21 16:44:48 -05:00
Nick Mathewson
5c45a333c3 Merge remote-tracking branch 'public/bug10169_023' into bug10169_024 
Conflicts:
	doc/tor.1.txt
	src/or/config.c
	src/or/or.h

The conflicts were all pretty trivial.
 2014-01-03 10:53:22 -05:00
Nick Mathewson
3121a6d0c8 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-12-23 19:01:29 -05:00
Nick Mathewson
3511549651 Clarify DirPort multiplicity 
Fix for #10470 as suggested by arma
 2013-12-23 19:00:46 -05:00
Nick Mathewson
e572ec856d Rename MaxMemInCellQueues to MaxMemInQueues 2013-11-20 12:12:23 -05:00
Nick Mathewson
fc5a881bd3 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-11-10 12:24:12 -05:00
Nick Mathewson
532f70a807 Change documentation DirServer->DirAuthority 
We renamed the option, but we didn't actually fix it in the log
messages or the docs.  This patch does that.

For #10124.  Patch by sqrt2.
 2013-11-10 12:21:23 -05:00
Nick Mathewson
e30fb0a160 Tweak file documentation in tor.1.txt 2013-11-07 14:52:29 -05:00
rl1987
75d2ea8a99 Updating manpage to describe some of the data directory files. 2013-11-07 14:47:47 -05:00
Nick Mathewson
940d286a74 Documentation and tests for 10060 2013-11-07 14:42:58 -05:00
rl1987
86cfc64d45 Implementing --allow-missing-torrc CLI option. 2013-11-07 14:26:05 -05:00
Nick Mathewson
12dc55f487 Merge branch 'prop221_squashed_024' 
Conflicts:
	src/or/or.h
 2013-11-01 10:28:01 -04:00
Nick Mathewson
0de71bf8eb Implement proposal 221: Stop sending CREATE_FAST 
This makes FastFirstHopPK an AUTOBOOL; makes the default "auto"; and
makes the behavior of "auto" be "look at the consensus."
 2013-11-01 10:04:48 -04:00
Nick Mathewson
61029d6926 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-31 14:03:01 -04:00
Nick Mathewson
1b312f7b55 Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4 2013-10-31 14:02:28 -04:00
Nick Mathewson
d3420e7e73 Mention that tor is client-by-default. From Weasel. Resolves #10057 2013-10-31 11:08:21 -04:00
Nick Mathewson
e02230dd85 Minor manpage tweaks from weasel; closes #10058 2013-10-31 10:55:18 -04:00
Karsten Loesing
2e0fad542c Merge branch 'morestats4' into morestats5 
Conflicts:
	doc/tor.1.txt
	src/or/config.c
	src/or/connection.h
	src/or/control.c
	src/or/control.h
	src/or/or.h
	src/or/relay.c
	src/or/relay.h
	src/test/test.c
 2013-10-28 12:09:42 +01:00
Roger Dingledine
49278cd68a clarify that DisableNetwork closes connections too 2013-10-25 16:56:20 -04:00
Nick Mathewson
17d368281a Merge remote-tracking branch 'linus/bug9206_option' 2013-10-16 11:20:43 -04:00
Nick Mathewson
882fb8383d Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-09 09:45:21 -04:00