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
ce450bddb7
Remove TunnelDirConns and PreferTunnelledDirConns
...
These options were added back in 0.1.2.5-alpha, but no longer make any
sense now that all directories support tunneled connections and
BEGIN_DIR cells. These options were on by default; now they are
always-on.
This is a fix for 10849, where TunnelDirConns 0 would break hidden
services -- and that bug arrived, I think, in 0.2.0.10-alpha.
2014-02-11 11:10:55 -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
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
72c1e5acfe
Switch ECDHE group default logic for bridge/relay TLS
...
According to the manpage, bridges use P256 for conformity and relays
use P224 for speed. But skruffy points out that we've gotten it
backwards in the code.
In this patch, we make the default P256 for everybody.
Fixes bug 9780; bugfix on 0.2.4.8-alpha.
2013-10-08 16:32:07 -04:00
Peter Palfrader
2c270136a4
Anchors for options (re#9866)
2013-10-08 16:06:19 -04:00
Peter Palfrader
4e37eba0ac
Anchors for options (re#9866)
2013-10-07 11:31:01 -04:00
Linus Nordberg
fab8fd2c18
Add TestingDirAuthVoteGuard option for specifying relays to vote Guard on.
...
Addresses ticket 9206.
2013-10-07 13:33:42 +02:00
Roger Dingledine
bce775c159
name it correctly, maybe
2013-10-01 15:47:38 -04:00
Nick Mathewson
5baacf5a9c
Mention "make test-network" in doc/HACKING
2013-10-01 12:50:48 -04:00
guilhem
f8c45339f7
Don't preprocess torify
...
Since torify has been removed from tsocks, it doesn't need to be
preprocessed. Closes #5505 .
2013-09-29 13:59:17 -04:00
Nick Mathewson
6178aaea06
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-09-20 11:01:10 -04:00
Nick Mathewson
f8b44eedf7
Get ready to stop sending timestamps in INTRODUCE cells
...
For now, round down to the nearest 10 minutes. Later, eliminate entirely by
setting a consensus parameter.
(This rounding is safe because, in 0.2.2, where the timestamp mattered,
REND_REPLAY_TIME_INTERVAL was a nice generous 60 minutes.)
2013-09-20 11:00:27 -04:00
Nick Mathewson
0c807cf3e4
Document that disabledebuggerattachment prevents cores
2013-09-19 12:14:07 -04:00
Nick Mathewson
e35c972851
Merge branch 'bug4647_squashed'
2013-09-13 12:36:55 -04:00
Nick Mathewson
75d795b1d7
Disallow --hash-password with no commandline arguments.
...
Fixes bug 9573.
Bugfix on 59453ac6e
in 0.0.9pre5, which fixed a crash in a silly way.
2013-09-13 12:36:40 -04:00
George Kadianakis
386e9fb297
Add Extended ORPort information to the man page.
2013-09-04 14:20:42 +03:00
Nick Mathewson
11352b0ce1
Add a clarification to gcov instructions
2013-09-03 15:44:13 -04:00
Nick Mathewson
28485d33ca
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-08-16 22:00:14 -04:00
Nick Mathewson
edaea773e5
Document the correct loglevel for the heartbeat message
2013-08-16 21:59:41 -04:00
Roger Dingledine
c7d3ecab57
new location for tarballs; and you should edit Makefile too
2013-08-10 18:33:37 -04:00
Nick Mathewson
ad49ceba1f
Update coverage instructions
2013-08-06 12:00:28 -04:00
Nick Mathewson
83a859e24c
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-07-31 21:49:30 -04:00
Roger Dingledine
ff6bb13c02
NumDirectoryGuards now tracks NumEntryGuards by default
...
Now a user who changes only NumEntryGuards will get the behavior she
expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha.
2013-07-30 12:05:39 -04:00
Nick Mathewson
d5a5a6a253
Allow {,k,kilo,m,mega,g,giga,t,tera}bit{,s} in torrc
...
Patch from CharlieB for ticket #9214
2013-07-26 16:07:11 +02:00
Roger Dingledine
2920d670de
fix typo
2013-07-23 05:16:56 -07:00
Roger Dingledine
0eca8737a1
fix typo
2013-07-18 23:35:20 -04:00
George Kadianakis
133f380c87
Add changes file and enrich the manual page.
2013-07-18 08:45:03 -04:00
Nick Mathewson
aac732322a
Merge remote-tracking branch 'public/gsoc-ctoader-cap-phase1-squashed'
2013-07-12 17:12:43 -04:00
Cristian Toader
f9c1ba6493
Add a basic seccomp2 syscall filter on Linux
...
It's controlled by the new Sandbox argument. Right now, it's rather
coarse-grained, it's Linux-only, and it may break some features.
2013-07-11 09:13:13 -04:00
Nick Mathewson
b5d1fded3d
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-06-18 10:25:30 -04:00
Nick Mathewson
d3063da691
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/config.c
src/or/relay.c
2013-06-18 10:23:03 -04:00
Nick Mathewson
2e1fe1fcf9
Implement a real OOM-killer for too-long circuit queues.
...
This implements "algorithm 1" from my discussion of bug #9072 : on OOM,
find the circuits with the longest queues, and kill them. It's also a
fix for #9063 -- without the side-effects of bug #9072 .
The memory bounds aren't perfect here, and you need to be sure to
allow some slack for the rest of Tor's usage.
This isn't a perfect fix; the rest of the solutions I describe on
codeable.
2013-06-18 10:15:16 -04:00
Nick Mathewson
45424b2ca1
Merge remote-tracking branch 'linus/bug8532'
2013-06-13 12:42:49 -04:00
Nick Mathewson
8c69207793
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-06-12 21:28:09 -04:00
Nick Mathewson
74a534be15
Fix the biggest errors in doc/HACKING
...
We can wait for 0.2.5 for a full rewrite. #8964
2013-06-12 21:27:30 -04:00
Nick Mathewson
ee250be6a6
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-06-12 21:14:31 -04:00
Nick Mathewson
a3f6f3316a
Remove various outdated documents.
...
doc/TODO and doc/spec/README were placeholders to tell people where to
look for the real TODO and README stuff -- we replaced them years ago,
though.
authority-policy, v3-authority-howto, and torel-design.txt belong in
torspec. I'm putting them in attic there since I think they may be in
large part obsolete, but someone can rescue them if they're not.
translations.txt is outdated, and refers to lots of programs other
than Tor. We have much better translation resources on the website
now.
tor-win32-mingw-creation.txt is pending review of a revised version
for 0.2.5 (see ticket #4520 ), but there's no reason to ship this one
while we're waiting for an accurate version.
the tor-rpm-creation.txt isn't obsolete AFAIK, but it belongs in
doc/contrib if anywhere.
Resolves bug #8965 .
2013-06-12 21:11:49 -04:00
Linus Nordberg
4d54b9774d
Add support for offsetting the voting interval in order to bootstrap faster.
...
A new option TestingV3AuthVotingStartOffset is added which offsets the
starting time of the voting interval. This is possible only when
TestingTorNetwork is set.
This patch makes run_scheduled_events() check for new consensus
downloads every second when TestingTorNetwork, instead of every
minute. This should be fine, see #8532 for reasoning.
This patch also brings MIN_VOTE_SECONDS and MIN_DIST_SECONDS down from
20 to 2 seconds, unconditionally. This makes sanity checking of
misconfiguration slightly less sane.
Addresses #8532 .
2013-06-08 15:25:32 +02:00
Nick Mathewson
beec881f92
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-06-05 11:20:45 -04:00
Linus Nordberg
c03cfc0546
Fix two cut'n'paste docu bugs.
2013-06-05 11:19:43 -04:00
Karsten Loesing
ef67077fba
Tweak TB_EMPTY event based on comments by nickm.
...
- Avoid control_event_refill_global function with 13 arguments and
increase code reuse factor by moving more code from control.c to
connection.c.
- Avoid an unsafe uint32_t -> int cast.
- Add TestingEnableTbEmptyEvent option.
- Prepare functions for testing.
- Rename a few functions and improve documentation.
2013-05-25 19:51:38 +02:00
Karsten Loesing
26b49f525d
Tweak CELL_STATS event based on comments by nickm.
...
- Move cell_command_to_string from control.c to command.c.
- Use accessor for global_circuitlist instead of extern.
- Add a struct for cell statistics by command instead of six arrays.
- Split up control_event_circuit_cell_stats by using two helper functions.
- Add TestingEnableCellStatsEvent option.
- Prepare functions for testing.
- Rename a few variables and document a few things better.
2013-05-25 19:51:38 +02:00
Karsten Loesing
2f893624ab
Tweak CONN_BW event based on comments by nickm.
...
- Rename read/write counters in connection_t to make it clear that these
are only used for CONN_BW events.
- Add TestingEnableConnBwEvent option.
2013-05-25 19:51:38 +02:00
Karsten Loesing
1293835440
Lower dir fetch retry schedules in testing networks.
...
Also lower maximum interval without directory requests, and raise
maximum download tries.
Implements #6752 .
2013-05-16 12:08:48 +02:00
Nick Mathewson
0124b10d28
Turn on ntor by default client-side
...
Implements #8561 .
2013-04-18 22:35:15 -04:00
Nick Mathewson
8aded5b07c
Manpage: refer to ExcludeExitNodes, not the nonexistent ExcludeEntryNodes
...
Spotted on tor-talk by "hamahangi".
2013-04-13 18:28:06 -04:00
Nick Mathewson
7f50af116f
Merge remote-tracking branch 'public/bug8117_023' into maint-0.2.4
...
Conflicts:
doc/tor.1.txt
src/or/config.c
src/or/connection.c
2013-04-11 01:39:55 -04:00
Nick Mathewson
cd5048d61e
Tighten prose in 8590 manpage fix
2013-03-27 21:58:07 -04:00
Patrick R McDonald
5a3eacf88c
First try on ticket 8590
2013-03-27 21:56:42 -04:00
Nick Mathewson
fa3c237739
Per-SOCKSPort configuration for bug 8117 fix.
...
This might be necessary if the bug8117 fix confuses any applications.
Also add a changes file.
2013-03-20 16:17:06 -04:00
Nick Mathewson
a660fe6fd5
Let testing networks override ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG
...
This adds a new option to fix bug 8508 which broke chutney
networks. The bug was introduced by 317d16de
.
2013-03-20 13:34:57 -04:00
Nick Mathewson
6f20a74d52
Merge branch 'bug8240_v2_squashed' into maint-0.2.4
...
Conflicts:
doc/tor.1.txt
src/or/circuitbuild.c
src/or/config.c
src/or/or.h
2013-03-19 16:15:27 -04:00
Nick Mathewson
18752bca5b
Drop the minimum guard lifetime back down to one month
...
Mike believes that raising the default to 2 months with no way to lower
it may create horrible load-balancing issues.
2013-03-19 16:04:40 -04:00
Nick Mathewson
aa040619d5
Document the GuardLifetime option
2013-03-19 16:03:57 -04:00
Nick Mathewson
343f7aa059
Make the guard lifetime configurable and adjustable via the consensus
...
Fixes 8240.
(Don't actually increase the default guard lifetime. It seems likely to
break too many things if done precipitiously.)
2013-03-19 16:02:19 -04:00
Nick Mathewson
60d1442136
Merge remote-tracking branch 'public/bug7768' into maint-0.2.4
2013-03-19 15:11:47 -04:00
Nick Mathewson
6fe4e24645
Use --test-commandline name in tor-fw-helper manpage
2013-03-19 15:11:34 -04:00
Nick Mathewson
7e9b6a19d4
Merge remote-tracking branch 'public/bug8290' into maint-0.2.4
2013-03-18 15:07:02 -04:00
Nick Mathewson
18da1e0cf2
Remove incentives.txt from tor git; putting it into torspec.
2013-03-15 11:25:45 -04:00
Nick Mathewson
aa051b7573
Improve asciidoc-helper's suggestion of what to install
...
Fixes bug #7766 .
Patch by David Fifield, revised by Peter Palfrader.
2013-03-15 11:18:25 -04:00
Nick Mathewson
8c211c3cda
Fix option names in tor-fw-helper manpage
...
fix for bug 7768
2013-03-11 17:57:27 -04:00
Roger Dingledine
edd6f02273
randomize SSLKeyLifetime by default
...
resolves ticket 8443.
2013-03-10 23:38:18 -04:00
Nick Mathewson
4740d2e8bc
Remove some lingering tsocks cruft.
...
Now the manpages no longer refer to tsocks or tsocks.conf, and we no
longer have or ship a tor-tsocks.conf. The only remaining instances
of "tsocks" in our repository are old ChangeLog and ReleaseNotes
entries, and the torify script saying that it doesn't support tsocks.
Fixes bug 8290.
2013-02-27 19:39:57 -05:00
Roger Dingledine
9bc05c30d7
update the in-progress bandwidth requirements for authorities
2013-02-25 09:19:04 -05:00
Nick Mathewson
2b1119db77
Document (on man page) which DNS record types Tor knows.
...
Fixes bug 7876
2013-02-19 02:47:44 -05:00
Peter Palfrader
47cfee781d
tor.1: Specify what Auto means for RefuseUnknownExits in more detail
2013-02-12 15:22:34 -05:00
Nick Mathewson
e5b07ba179
Merge remote-tracking branch 'arma/bug7054'
2013-02-07 15:22:36 -05:00
Mike Perry
2b68a06618
Update manpage for new pathbias use thresholds.
2013-02-04 17:15:51 -08:00
Nick Mathewson
acb43c0735
Merge remote-tracking branch 'public/feature7706'
2013-02-01 17:24:08 -05:00
Mike Perry
dfcfb5d17d
Refactor the scaling parameter fetching into a single function.
...
Also, deprecate the torrc options for the scaling values. It's unlikely anyone
but developers will ever tweak them, even if we provided a single ratio value.
2013-02-01 17:01:12 -05:00
Nick Mathewson
29136bd7e4
Merge branch 'bug5956_squashed'
2013-01-30 11:59:51 -05:00
Nick Mathewson
02c320916e
Parameterize FRAC_USABLE_NEEDED for fraction of circuits
...
Instead of hardcoding the minimum fraction of possible paths to 0.6, we
take it from the user, and failing that from the consensus, and
failing that we fall back to 0.6.
2013-01-30 11:58:17 -05:00
Nick Mathewson
ec7ffed79d
Document the ?? country code.
2013-01-30 10:19:41 -05:00
Andrea Shepard
123daffb60
Merge branch 'bug7802' of ssh://git-rw.torproject.org/mikeperry/tor
2013-01-28 16:16:45 -08:00
Mike Perry
a678ff9ec1
Document path use bias options in the manpage.
2013-01-18 21:23:37 -08:00
Nick Mathewson
ff9bdbd56f
When excluding nodes by country, exclude {??} and {A1} too
...
This is ticket 7706, reported by "bugcatcher." The rationale here
is that if somebody says 'ExcludeNodes {tv}', then they probably
don't just want to block definitely Tuvaluan nodes: they also want
to block nodes that have unknown country, since for all they know
such nodes are also in Tuvalu.
This behavior is controlled by a new GeoIPExcludeUnknown autobool
option. With the default (auto) setting, we exclude ?? and A1 if
any country is excluded. If the option is 1, we add ?? and A1
unconditionally; if the option is 0, we never add them.
(Right now our geoip file doesn't actually seem to include A1: I'm
including it here in case it comes back.)
This feature only takes effect if you have a GeoIP file. Otherwise
you'd be excluding every node.
2013-01-17 18:07:36 -05:00
Nick Mathewson
b0b3c14c11
Eliminate MaxOnionsPending; replace it with MaxOnionQueueDelay
...
The right way to set "MaxOnionsPending" was to adjust it until the
processing delay was appropriate. So instead, let's measure how long
it takes to process onionskins (sampling them once we have a big
number), and then limit the queue based on its expected time to
finish.
This change is extra-necessary for ntor, since there is no longer a
reasonable way to set MaxOnionsPending without knowing what mix of
onionskins you'll get.
This patch also reserves 1/3 of the onionskin spots for ntor
handshakes, on the theory that TAP handshakes shouldn't be allowed to
starve their speedier cousins. We can change this later if need be.
Resolves 7291.
2013-01-03 13:03:41 -05:00
Nick Mathewson
b1bdecd703
Merge branch 'ntor-resquashed'
...
Conflicts:
src/or/cpuworker.c
src/or/or.h
src/test/bench.c
2013-01-03 11:52:41 -05:00
Nick Mathewson
ed3c8d9d44
Document UseNTorHandshake
2013-01-03 11:29:48 -05:00
Nick Mathewson
885e8d35c7
Merge remote-tracking branch 'mikeperry/209-path-bias-changes'
2012-12-25 23:30:28 -05:00
Nick Mathewson
c2c6e8e5b2
Add documentation for directory guard options
2012-12-25 23:19:10 -05:00
Nick Mathewson
25afecdbf9
Make ECDHE group configurable: 224 for public, 256 for bridges (default)
2012-12-25 20:22:46 -05:00
Nick Mathewson
a60680c226
Remove the obsolete doc/TODO.* files
...
Closes bug #7730 .
2012-12-17 22:26:05 -05:00
Nick Mathewson
c1226cf4f9
Document PreferIPv6Automap in the manpage
2012-12-17 14:51:31 -05:00
Nick Mathewson
de4cc126cb
Build and test most of the machinery needed for IPv6 virtualaddrmaps
...
With an IPv6 virtual address map, we can basically hand out a new
IPv6 address for _every_ address we connect to. That'll be cool, and
will let us maybe get around prop205 issues.
This uses some fancy logic to try to make the code paths in the ipv4
and the ipv6 case as close as possible, and moves to randomly
generated addresses so we don't need to maintain those stupid counters
that will collide if Tor restarts but apps don't.
Also has some XXXX items to fix to make this useful. More design
needed.
2012-12-17 14:51:29 -05:00
Nick Mathewson
ac990aa44a
Turn off by-default use of client-side DNS cacheing.
2012-12-17 14:50:04 -05:00
Nick Mathewson
bde6f2daba
Add documentation for the client-side DNS cache options
2012-12-17 14:49:32 -05:00
Nick Mathewson
01ac961ca1
Merge branch 'fallback_dirsource_v3'
2012-12-13 12:42:29 -05:00
Mike Perry
43a00877cf
Update manpage.
2012-12-10 00:13:55 -08:00
Mike Perry
df4aeaa0d6
Update manpage for new PathBias torrc options.
2012-12-07 15:28:37 -08:00
Nick Mathewson
504d4aa8c6
Expand the manpage to say: watch out for nonlocal socks
...
This clears up the remaining issue stopping me from closing bug 6297.
2012-12-07 12:42:55 -05:00
Nick Mathewson
f742b33d85
Drop FallbackNetworkstatusFile; it never worked.
2012-12-06 11:28:49 -05:00
Nick Mathewson
a8d491a8fd
Add an option to weight down authorities when choosing a fallback
2012-12-06 11:28:49 -05:00
Nick Mathewson
06cd62266f
Add a way to configure selection weights for dir_server_t
2012-12-06 11:28:49 -05:00
Nick Mathewson
90f6071d8d
New FallbackDir option to add extra directories for bootstraping
...
This replaces the old FallbackConsensus notion, and should provide a
way -- assuming we pick reasonable nodes! -- to give clients
suggestions of placs to go to get their first consensus.
2012-12-06 11:28:49 -05:00
Nick Mathewson
ded70363a7
Rename DirServer to DirAuthority
2012-12-06 11:23:43 -05:00
Nick Mathewson
190c1d4981
Merge branch 'bug7013_take2_squashed'
2012-11-27 22:18:16 -05:00
George Kadianakis
f88c303869
Add a torrc option to specify the bind address of managed proxies.
2012-11-27 22:18:08 -05:00
Nick Mathewson
61d740ed01
Add manual page entries for new IPv6-exits options
2012-11-14 23:35:13 -05:00
Nick Mathewson
626a8b60d7
Merge remote-tracking branch 'linus/bug5053-bug5055'
...
Conflicts:
src/or/geoip.c
2012-11-04 21:44:31 -05:00
Nick Mathewson
4a9bc5658f
Fix instructions for using Tor with gcov
...
It seems as if our new build system broke gcov for me. I've tried to
fix doc/HACKING to describe what I needed to do in order to make it
work again.
2012-10-24 15:03:49 -04: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
0b598cb2bb
Say "KBytes" rather than "KB" in the man page
...
(for various values of K), to further reduce confusion about whether
Tor counts in units of memory or fractions of units of memory. Fixes
bug 7054.
2012-10-06 01:57:13 -04:00
Linus Nordberg
1cbf45bed1
Make option OutboundBindAddress accept IPv6 addresses too.
...
Implements ticket 6786.
2012-09-20 17:09:25 +02:00
Nick Mathewson
0e0a167742
Merge branch 'bug6843'
2012-09-19 09:01:15 -04:00
Nick Mathewson
f612a9eb1b
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-19 08:26:07 -04:00
Nick Mathewson
b9c86948e4
Clarify that hidden services are TCP only
...
Also remove some trailing whitespace.
Patch from maker; fixes bug 6024.
2012-09-19 08:19:21 -04:00
Nick Mathewson
a78eeb4cbc
Fix dependency checking on manpage builds
...
Fixes bug 6843; bugfix on 0.2.4.1-alpha.
2012-09-14 10:36:42 -04:00
Roger Dingledine
9ab3b332ae
Merge branch 'maint-0.2.3'
2012-09-14 02:41:13 -04:00
Robert Ransom
909691f1ae
Fix man page typo
2012-09-13 23:25:03 -07:00
Roger Dingledine
e1e34ee4e4
raise bandwidthrate/bandwidthburst to a new "infinite"
...
addresses bug 6605.
2012-09-10 03:03:06 -04:00
Nick Mathewson
e9684405ac
Merge remote-tracking branch 'asn/bug4567_rebased'
2012-09-06 10:12:28 -04:00
Roger Dingledine
6f82ae44cb
Merge branch 'maint-0.2.3'
2012-09-05 16:41:43 -04:00
Roger Dingledine
97dbff51e6
Update the minimum bandwidth for a public relay
...
The current cutoff is 30KB, but in reality a useful cutoff is probably
more like 50KB or 100KB.
2012-09-05 16:40:57 -04:00
Nick Mathewson
116c8409ba
Merge remote-tracking branch 'linus/bug6770_3'
...
Conflicts:
doc/tor.1.txt
src/or/config.c
2012-09-05 11:35:26 -04:00
George Kadianakis
44fe717524
General tweaks and fixes for Nick's comments.
...
* Add changes/ files.
* Edit the tor-fw-helper manpage.
* Fix check-spaces.
* Add prototype for get_list_of_ports_to_forward().
* Fix tor_parse_long() TCP port range.
* Improve doc. of tor_check_port_forwarding().
* Check for overflows in tor_check_port_forwarding().
* Demote successful port forwarding to LOG_INFO.
Conflicts:
src/common/address.c
src/or/circuitbuild.c
2012-09-05 18:23:28 +03:00
Linus Nordberg
f7c97cd40b
Remove AuthDirPublishIPv6 and let AuthDirHasIPv6Connectivity fill its function.
...
See #4771 for rationale.
Note that this patch does not take suggested changes in #4470 into
account and keeps treating AuthDirHasIPv6Connectivity as an
AUTOBOOL. Thus, bug fixes for that are included here as well.
This is a fix on master, unreleased as of now.
2012-09-05 13:35:39 +02:00
Linus Nordberg
0e53742a85
Make AuthDirHasIPv6Connectivity a BOOL.
...
This is a fix of unreleased tor. It solves ticket #6770 .
2012-09-05 12:47:01 +02:00
Roger Dingledine
67065c3c06
minor typos i found while constructing the changelog
2012-09-05 04:46:27 -04:00
Linus Nordberg
e04e1a2e7d
Clients connect to public relays over IPv6.
...
Add ClientUseIPv6 and ClientPreferIPv6ORPort configuration options.
Use "preferred OR port" for all entry nodes, not only for bridges.
Mark bridges with "prefer IPv6 OR port" if an IPv6 address is
configured in Bridge line and ClientPreferIPv6ORPort is set.
Mark relays with "prefer IPv6 OR port" if an IPv6 address is found in
descriptor and ClientPreferIPv6ORPort is set.
Filter "preferred OR port" through the ClientUseIPv6 config option. We
might want to move this test to where actual connection is being set
up once we have a fall back mechanism in place.
Have only non-servers pick an IPv6 address for the first hop: We
don't want relays to connect over IPv6 yet. (IPv6 has never been used
for second or third hops.)
Implements ticket 5535.
2012-09-04 12:57:21 -04:00
Nick Mathewson
485b4b7eee
Rename configure.in to configure.ac
...
This is the preferred filename to use with Autoconf 2.50 and later.
2012-09-04 11:12:00 -04:00
Nick Mathewson
48a6816eb5
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-31 18:39:27 -04:00
Nick Mathewson
b17bb543da
Merge branch 'bug6732' into maint-0.2.3
2012-08-31 18:39:11 -04:00
Nick Mathewson
774979ca45
Document consensus and microdesc files
...
Bugfix for #6732 .
2012-08-31 11:35:47 -04:00
Nick Mathewson
0c5a44ed0a
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-27 16:16:27 -04:00
Nick Mathewson
b7c172c9ec
Disable extending to private/internal addresses by default
...
This is important, since otherwise an attacker can use timing info
to probe the internal network.
Also, add an option (ExtendAllowPrivateAddresses) so that
TestingTorNetwork won't break.
Fix for bug 6710; bugfix on all released versions of Tor.
2012-08-27 11:19:29 -04:00
Jim Meyering
7638612f01
Better fix to avoid loudness on mkdir -p
...
(commit message by nickm)
2012-08-27 10:05:02 -04:00
Nick Mathewson
0867479e3e
Add some attributes to make a2x quieter
2012-08-23 13:19:54 -04:00
Nick Mathewson
b67057a542
Make asciidoc generation quieter
2012-08-23 13:19:40 -04:00
Nick Mathewson
3f66664935
Add missing dependency so the html.in files get built
2012-08-23 12:52:33 -04:00
Jim Meyering
8f60f70e21
Replace man_MANS with nodist_man1_MANS
...
(commit message by nickm)
2012-08-23 12:36:33 -04:00
Stewart Smith
301e24e4a8
fix up calling of config.status to generate docs
2012-08-09 11:03:48 -04:00
Stewart Smith
2606c8b289
Fix up make distcheck and greatly simplify docs dependencies (although it's still a bit odd)
2012-08-09 11:03:48 -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
Stewart Smith
c9aafa0962
add $(AM_V_GEN) to documentation generation Makefile targets.
...
This makes the V=1 or V=0 automake silent build options display (or hide)
the full command line used.
GEN foo.bar
will be seen rather than the full command.
As with all automake silent rules, "make V=1" will output the full command.
2012-08-02 10:05:36 -04:00
Nick Mathewson
43b81325b5
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-31 11:49:32 -04:00
Ondrej Mikle
eeb81b5bb1
Fixes/beautification of RPM spec. Tiny improvements in RPM build docs.
2012-07-31 11:41:40 -04:00
Ondrej Mikle
0e778ac604
Workaround for building EL5 RPMs by specifying rpmbuild-md5. Updated old note about using static libevent when building RPMs.
2012-07-31 11:41:40 -04:00
Ondrej Mikle
cf20fac37f
Dependencies for RPM building with mock should work now
2012-07-31 11:41:40 -04:00
Nick Mathewson
e6d61ee594
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-31 10:18:05 -04:00
Nick Mathewson
d9bd0de062
Fix some manpage typos
...
This is based on a pair of patches from A. Costa. I couldn't apply
those directly, since they changed the generated *roff files, not
the asciidoc source.
Fixes Tor bug 6500 and Debian bug 683359.
2012-07-31 10:16:03 -04:00
Nick Mathewson
952f562691
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-23 12:31:24 -04:00
Steven Murdoch
5b853612fb
Clarify how to build asciidoc files using homebrew on Mac OS X
2012-07-20 09:49:02 -04:00
Linus Nordberg
fff842a47c
Add config option AuthDirPublishIPv6.
...
Test for config option AuthDirPublishIPv6 == 1 rather than for running
as a bridge authority when deciding whether to care or not about IPv6
OR ports in descriptors.
Implements enhancement #6406 .
2012-07-19 17:51:15 -04:00
Linus Nordberg
044da1bf0f
Add configure option AuthDirHasIPv6Connectivity.
...
Implements enhancement 5974.
2012-07-19 18:21:22 +02:00
Nick Mathewson
9ad5b25930
Improve Alternate*Authority docs. Bug 6387.
2012-07-16 11:21:20 -04:00
Nick Mathewson
f5e86bcd6c
Document 0.2.3.x torrc/default-torrc/command line semantics changes
...
Bug 4748
squash! Document 0.2.3.x torrc/default-torrc/command line semantics changes
Incorporates fixes suggested by rransom.
2012-06-18 12:01:27 -04:00
Roger Dingledine
427d4dd148
fix typos, logic error, default in man page
2012-06-15 03:25:27 -04:00
Mike Perry
8d59690033
Defend against entry node path bias attacks
...
The defense counts the circuit failure rate for each guard for the past N
circuits. Failure is defined as the ability to complete a first hop, but not
finish completing the circuit all the way to the exit.
If the failure rate exceeds a certain amount, a notice is emitted.
If it exceeds a greater amount, a warn is emitted and the guard is disabled.
These values are governed by consensus parameters which we intend to tune as
we perform experiments and statistical simulations.
2012-06-14 13:19:56 -07:00
Nick Mathewson
75706527c1
Document --hush; fix documentation for --quiet.
2012-06-14 14:58:51 -04:00
Nick Mathewson
70910479e3
Merge remote-tracking branch 'public/bug5598'
...
Conflicts:
doc/tor.1.txt
Conflict was on a formatting issue in the manpage.
2012-06-11 10:26:48 -04:00
Nick Mathewson
2d127eacd9
List defaults consistently in manpage
...
Nearly everywhere, we end options with "(Default: foo)". But in a
few places, we inserted an extra period after or before the close
parenthesis, and in a few other places we said "(Defaults to foo)".
Let's not do that.
2012-06-11 09:52:43 -04:00
Nick Mathewson
b74f851861
Correct the defaults for the *Statistics options
2012-06-07 13:46:51 -04:00
Nick Mathewson
8a341cc429
Change the default for DynamicDHGroups to 0
...
This feature can make Tor relays less identifiable by their use of the
mod_ssl DH group, but at the cost of some usability (#4721 ) and bridge
tracing (#6087 ) regressions.
We should try to turn this on by default again if we find that the
mod_ssl group is uncommon and/or we move to a different DH group size
(see #6088 ). Before we can do so, we need a fix for bugs #6087 and
Resolves ticket #5598 for now.
2012-06-06 12:00:04 -04:00
Roger Dingledine
f4db3e2631
clarify that LongLivedPorts is for hidden services too
2012-06-03 21:07:34 -04:00
Nick Mathewson
f00a8b4307
Another dirport/orport correction; this one from "cypherpunks"
2012-05-16 15:45:20 -04:00
Nick Mathewson
400c7ce2b6
Document that the ORPort flags apply to DirPort too. (thanks, Roger.)
2012-05-16 15:07:54 -04:00
Nick Mathewson
3c7c51ce07
5597: document new ORPort options
2012-05-16 14:54:16 -04:00
Nick Mathewson
dfbe779a45
Clarify SessionGroup documentation. Bug 5437.
2012-05-16 14:43:11 -04:00
Nick Mathewson
82ce43a706
Merge remote-tracking branch 'public/bug3964'
2012-05-16 11:33:52 -04:00
Nick Mathewson
1150b6b43e
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-05-15 11:23:06 -04:00
Nick Mathewson
8e07798284
Clarify MaxCircuitDirtiness behavior with hidden services. Bug 5259.
2012-05-15 11:22:06 -04:00
Nick Mathewson
1cf970c3db
Merge remote-tracking branch 'asn/bug5540'
2012-05-10 14:24:17 -04:00
Nick Mathewson
dc60b5d6a7
Improve our documentation for the NT Service command line options
...
We explain the --options option, document --nt-service as an
internal-use-only thing (which it is), fix a URL, and generally
improve the prose.
2012-04-11 13:10:35 -04:00
Nick Mathewson
77e51224fa
Obsolete GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays
...
Closes ticket 4572.
2012-04-11 10:59:11 -04:00
Daniel 'koolfy' Faucon
42143979d8
Add a warning about settign a bridge in MyFamily
2012-04-02 18:16:14 -04:00
Roger Dingledine
c7cbd06d5f
Merge branch 'maint-0.2.2'
...
Conflicts:
src/or/config.c
2012-04-01 16:03:16 -04:00
Roger Dingledine
40ab832c4e
BridgePassword was never for debugging
...
It is for the not-yet-implemented bridge community design.
2012-04-01 15:59:00 -04:00
George Kadianakis
31ed10f6c2
Explain TransportProxy within doc/state-contents.txt.
2012-03-31 14:33:11 +02:00
Roger Dingledine
c3a7bcf4e6
tab-man strikes back (fixup on a9c0e9fec2
)
2012-03-28 04:06:56 -04:00
Nick Mathewson
a9c0e9fec2
Write initial documentation for the contents of the state file
...
Fixes bug 2987. There is still some information to go, but now we
have a place to put it.
2012-03-28 04:08:56 -04:00
Roger Dingledine
92862c6d48
Merge branch 'maint-0.2.2'
2012-02-02 02:32:44 -05:00
Roger Dingledine
688903e919
Update "ClientOnly" man page entry
...
There isn't really any point to messing with it. Resolves ticket 5005.
2012-02-02 02:31:28 -05:00
George Kadianakis
8265a9e5b1
Better documentation of transport-related torrc options.
...
Document ServerTransportPlugin and the managed proxy version of
ClientTransportPlugin.
2012-01-21 16:28:48 +02:00
Nick Mathewson
b14ac10b7f
Add missing documentation for some options introduced in 0.2.3.x
2012-01-18 14:50:13 -05:00
Nick Mathewson
93d3a917e8
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-01-18 14:45:18 -05:00
Nick Mathewson
676bba8e0c
Documentation for GiveGuardFlagTo... option
2012-01-18 14:44:29 -05:00
Roger Dingledine
1e923dd2fb
fix crash bug in original feature4207 branch
...
PLURAL() assumes that the plural is the canonical name for the option,
so now it is.
2012-01-16 21:20:46 -05:00
Nick Mathewson
938531773a
Allow authorities to baddir/badexit/invalid/reject nodes by cc
...
Implements ticket #4207
2012-01-13 12:28:47 -05:00
Sebastian Hahn
98959f63ac
Disallow disabling DisableDebuggerAttachment on runnning Tor
...
Also, have tor_disable_debugger_attach() return a tristate of
success/failure/don't-know-how , and only log appropriately.
2012-01-04 15:09:02 -05:00
Robert Ransom
836161c560
Add an option to close HS service-side rend circs on timeout
2011-12-27 08:02:43 -08:00
Robert Ransom
078e3e9dd5
Add an option to close 'almost-connected' HS client circs on timeout
2011-12-27 08:02:43 -08:00
Robert Ransom
c6a8ee36fb
Move description of HidServAuth out of the FascistFirewall group
2011-12-27 08:02:41 -08:00
Nick Mathewson
d04f21bf39
Merge branch 'feature2553-v4-rebased'
2011-11-30 14:54:33 -05:00
Arturo Filastò
db648fe886
Add some more documentation
2011-11-30 14:54:15 -05:00
Nick Mathewson
3b88b63826
Merge branch 'bug933_nm_rebased_v2'
...
Conflicts:
src/test/test.c
2011-11-30 14:10:22 -05:00
Nick Mathewson
00ecc22126
Revise MapAddress manpage
...
make the asciidoc work; make the example more generic; tighten the
prose a little; be more specific that *.example.com matches
example.com; simplify an example.
2011-11-30 14:08:11 -05:00
Robert Hogan
53ce6bb52d
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8
...
1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'.
This has resulted in a slight refactoring of config_register_addressmaps.
2. Add some more detail to the man page entry for AddressMap.
3. Fix initialization of a pointer to NULL rather than 0.
4. Update the unit tests to cater for the changes in 1 and test more explicitly for
recursive mapping.
2011-11-30 14:08:10 -05:00
Robert Hogan
909e9769ec
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:4
...
1. Implement the following mapping rules:
MapAddress a.b.c d.e.f # This is what we have now
MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f
MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f
(Note that 'a.b.c .d.e.f' is invalid, and will be rejected.)
2. Add tests for the new rules.
3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work.
4. Update addressmap_entry_t with an is_wildcard member.
2011-11-30 14:08:10 -05:00
Robert Hogan
c6d8c6baaa
bug933 - Match against super-domains in MapAddress
...
Allow MapAddress to handle directives such as:
MapAddress .torproject.org .torserver.exit
MapAddress .org 1.1.1.1
Add tests for addressmap_rewrite.
2011-11-30 14:08:10 -05:00
Nick Mathewson
e718397880
Correct manpage entry for DynamicDHGroups
2011-11-29 18:42:49 -05:00
Nick Mathewson
da6c136817
Merge remote-tracking branch 'asn-mytor/bug4548_take2'
2011-11-29 18:30:41 -05:00
Nick Mathewson
f4d8ed4b28
Manpage for DisableNetwork
2011-11-28 16:01:47 -05:00
Nick Mathewson
68114ca52c
Merge remote-tracking branch 'ioerror/DisableDebuggerAttachment'
...
Conflicts:
src/or/config.c
2011-11-24 23:38:32 -05:00
George Kadianakis
21babd152e
Document DynamicPrimes in the manual page.
2011-11-24 22:13:26 +01:00
Robert Ransom
b2212bf9b4
Add Tor2webMode configuration option
2011-11-24 03:54:32 -08:00
Roger Dingledine
e18fa28248
sebastian is the new karsten, i hear
2011-11-23 04:41:46 -05:00
Roger Dingledine
023d8b6cf8
update the man page for the new AuthDirFastGuarantee value
2011-11-21 18:45:44 -05:00
Roger Dingledine
6a76007b08
Merge branch 'maint-0.2.2'
...
Conflicts:
src/or/dirserv.c
2011-11-21 18:36:49 -05:00
Roger Dingledine
97a209ea28
man page entries for AuthDir{Fast,GuardBW}Guarantee
2011-11-21 18:32:32 -05:00
Nick Mathewson
21dd6eae9e
Merge remote-tracking branch 'asn-mytor/bug4012_clienttransportplugin'
2011-11-07 11:37:29 -05:00
George Kadianakis
1c532594e7
Added man entry for ClientTransportPlugin.
2011-11-06 00:50:22 +01:00
Roger Dingledine
350fe95259
fix grammar in man page entries from proposal 171
2011-11-03 19:08:25 -04:00
Roger Dingledine
a518dd6650
Merge branch 'maint-0.2.2'
2011-10-25 19:34:42 -04:00
Roger Dingledine
ac115f1125
unmangle the fingerprint example in the man page
...
Remove a confusing dollar sign from the example fingerprint in the
man page, and also make example fingerprint a valid one.
2011-10-25 18:24:37 -04:00
Roger Dingledine
0e4f5e7cb1
fix default for TokenBucketRefillInterval in man page
2011-09-28 18:23:17 -04:00
Nick Mathewson
41dfc4c19c
Make bufferevents work with TokenBucketRefillInterval
2011-09-22 15:07:34 -04:00
Nick Mathewson
1e61184628
Make documentation for TokenBucketRefillInterval match its behavior
2011-09-22 15:07:34 -04:00
Florian Tschorsch
6b1d8321ae
New torrc option to allow bucket refill intervals of less than 1 sec
...
Implements bug3630.
2011-09-22 15:07:23 -04:00
Nick Mathewson
41eef6680e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/dirserv.c
src/or/networkstatus.c
Conflicts were related to routerinfo->node shift.
2011-09-07 14:51:55 -04:00
Nick Mathewson
dfa6cde4d4
Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2
2011-09-07 14:43:06 -04:00
Roger Dingledine
fe0fa91164
Merge branch 'maint-0.2.2'
2011-09-02 07:23:37 -04:00
Roger Dingledine
e0dae64449
Correct man page: multiple control auth styles can be set at once
2011-09-02 07:01:55 -04:00
Roger Dingledine
3888117318
add another heuristic for making release notes
2011-08-28 21:43:19 -04:00
Nick Mathewson
372262b458
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-08-25 18:55:28 -04:00
Sebastian Hahn
cc33ac362b
Mention that HiddenServiceDir must exist
2011-08-25 22:26:54 +02:00
Nick Mathewson
6e923ed8cd
Add an OptimisticData option to control client-side optimistic data
2011-07-20 14:14:21 -04:00
Nick Mathewson
12dfb4f5d8
Use socks username/password information in stream isolation
2011-07-19 02:44:12 -04:00
Nick Mathewson
891ccd3cd0
Manpage updates for proposal 171 (isolated streams)
2011-07-19 02:02:18 -04:00
Nick Mathewson
d67b304b20
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-07-14 09:51:58 -04:00
Sebastian Hahn
5580fbb0c4
Update HACKING with some more release instructions
2011-07-14 09:51:24 -04:00
Nick Mathewson
eee942c5be
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-07-06 10:56:47 -04:00
Sebastian Hahn
1a016c9233
Fix weird formatting of html manpage
...
Asciidoc was inserting <pre> tags for paragraphs that started with a
'+' at the beginning of the line. Instead, we need a space in front of
the plus.
2011-07-06 10:47:06 +02:00
Nick Mathewson
9919b01275
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-22 18:15:27 -04:00
Roger Dingledine
b181985a8f
explain that the ./publish should happen soon after the scp
...
otherwise you scp a tarball up but only one version of the website has it.
2011-06-21 00:37:18 -04:00
intrigeri
8b265543eb
Add port 6523 (Gobby) to LongLivedPorts.
2011-06-20 12:08:46 -04:00
Nick Mathewson
a046966baf
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/or.h
2011-06-19 21:00:15 -04:00
Nick Mathewson
cabb16caa9
Revert "Update man page for new UseBridges tristate behaviour."
...
This reverts commit 40cfad1b5a
.
2011-06-17 16:45:23 -04:00
Sebastian Hahn
910dadd6ea
Ensure the release tarball contains all manpages
...
Thanks to Nick for the idea for the fix.
2011-06-12 13:58:53 +02:00
Nick Mathewson
74239f61d2
Move errant doc/nodefamily_routerset into 0.2.3.1-alpha ChangeLog. Fix bug 3373
2011-06-10 01:04:12 -04:00
Robert Ransom
f45261cb29
Increase default required uptime for HSDirs to 25 hours
2011-06-03 12:17:53 -04:00
Robert Ransom
1546054d81
Add a VoteOnHidServDirectoriesV2 configuration option
2011-06-03 12:16:55 -04:00
Nick Mathewson
13ec1bf5c2
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-03 10:47:35 -04:00
anonym
40cfad1b5a
Update man page for new UseBridges tristate behaviour.
2011-06-02 15:11:21 -04:00
Jacob Appelbaum
f79a75f597
New configuration option: DisableDebuggerAttachment
...
If set to 1, Tor will attempt to prevent basic debugging
attachment attempts by other processes. (Default: 1)
Supports Mac OS X and Gnu/Linux.
Sebastian provided useful feedback and refactoring suggestions.
Signed-off-by: Jacob Appelbaum <jacob@appelbaum.net>
2011-06-01 17:35:43 -07:00
Nick Mathewson
4ac8ff9c9f
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-15 20:22:44 -04:00
Sebastian Hahn
4198261291
Clean up the 2972 implementation a little
2011-05-15 20:20:28 -04:00
Jérémy Bobbio
d41ac64ad6
Add UnixSocketsGroupWritable config flag
...
When running a system-wide instance of Tor on Unix-like systems, having
a ControlSocket is a quite handy mechanism to access Tor control
channel. But it would be easier if access to the Unix domain socket can
be granted by making control users members of the group running the Tor
process.
This change introduces a UnixSocketsGroupWritable option, which will
create Unix domain sockets (and thus ControlSocket) 'g+rw'. This allows
ControlSocket to offer same access control measures than
ControlPort+CookieAuthFileGroupReadable.
See <http://bugs.debian.org/552556 > for more details.
2011-05-15 20:20:28 -04:00
Nick Mathewson
600744b4be
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/dirserv.c
src/or/or.h
2011-05-13 10:48:07 -04:00
Nick Mathewson
7f654a6a6f
Add a ControlPortFileGroupWritable option
2011-05-13 10:41:29 -04:00
Nick Mathewson
dad12188a6
Write automatically-chosen control ports to a file.
2011-05-13 10:41:28 -04:00
Nick Mathewson
5fec8fe559
"(Socks|Control|etc)Port auto" now tells Tor to open an arbitrary port
...
This is the major part of the implementation for trac issue 3076.
2011-05-13 10:41:18 -04:00
Nick Mathewson
8fa7bcead5
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-12 11:36:41 -04:00
Nick Mathewson
2c88dd7f95
Clean up a formatting issue on the manpge; bug3154.
2011-05-12 11:36:20 -04:00
Roger Dingledine
6d5478a8a7
Merge branch 'maint-0.2.2'
2011-05-10 23:06:12 -04:00
Roger Dingledine
ec25c1f6ca
another changelog heuristic based on 0.2.3.1-alpha
2011-05-10 21:30:55 -04:00
Nick Mathewson
e6980faec4
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/directory.c
2011-05-09 13:39:51 -04:00
Nick Mathewson
09d7af7789
Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
2011-05-09 13:37:56 -04:00
Nick Mathewson
1065a5ef29
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-05 21:54:04 -04:00
Andrew Lewman
be7e8f5bb9
fix the website directions.
2011-05-05 15:28:29 -04:00
Nick Mathewson
4c9bd06d0d
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-04 17:38:33 -04:00
Nick Mathewson
0ee524b57f
Merge branch 'bug2379' into maint-0.2.2
2011-05-04 17:37:56 -04:00
Nick Mathewson
699af20e9a
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-04 17:21:44 -04:00
Nick Mathewson
29f1ffa0fe
More notes on how to upload tarballs from erinn
2011-05-04 17:21:33 -04:00
Nick Mathewson
b04dca448d
Add some missing torrc entries to tor.1.txt
...
Fixes bug 2379
2011-05-03 22:14:40 -04:00
Nick Mathewson
27b3b7aa58
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-02 20:18:28 -04:00
Nick Mathewson
033c27ac5e
Add a couple of notes to doc/HACKING based on 0.2.2.25-alpha process
2011-05-02 16:55:50 -04:00
Nick Mathewson
c48d6da24c
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-29 11:15:11 -04:00
Roger Dingledine
93b0183d3c
add another heuristic for changes stanzas
2011-04-29 01:35:21 -04:00
Nick Mathewson
676190e895
Update hacking file with terse notes on formatting changelog
2011-04-28 23:44:48 -04:00
Nick Mathewson
cd42ae7185
Only authorities should automatically download v2 networkstatus documents
...
Clients and relays haven't used them since early 0.2.0.x. The only
remaining use by authorities learning about new relays ahead of scedule;
see proposal 147 for what we intend to do about that.
We're leaving in an option (FetchV2Networkstatus) to manually fetch v2
networkstatuses, because apparently dnsel and maybe bwauth want them.
This fixes bug 3022.
2011-04-28 21:06:07 -04:00
Nick Mathewson
78c610eea9
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
doc/tor.1.txt
2011-04-27 15:20:01 -04:00
Nick Mathewson
8b686d98c4
Merge maint-0.2.2 for the bug1090-part1-squashed branch
...
Resolved conflicts in:
doc/tor.1.txt
src/or/circuitbuild.c
src/or/circuituse.c
src/or/connection_edge.c
src/or/connection_edge.h
src/or/directory.c
src/or/rendclient.c
src/or/routerlist.c
src/or/routerlist.h
These were mostly releated to the routerinfo_t->node_t conversion.
2011-04-27 14:36:30 -04:00
Roger Dingledine
0f48e8fa9a
minor tweaks to manpage
2011-04-27 14:04:50 -04:00
Nick Mathewson
2ac768e89f
Revise the manpage to contain the actual intended *Nodes behavior
...
This is a squashed version of my former desired_nodes_behavior branch
that we used to specify the intended results wrt bug 1090.
2011-04-27 13:39:22 -04:00
Nick Mathewson
1a49fdecf8
Tweaks to Cagara's CountPrivateBandwidth patch:
...
- Document it in the manpage
- Add a changes entry
- No need to log when it is set: we don't log for other options.
- Use doxygen to document the new flag.
- Test truth of C variables with "if (x)", not "if (x == 1)".
- Simplify a complex boolean expression by breaking it up.
2011-04-05 16:24:42 -04:00
Nick Mathewson
4740311d18
Merge remote branch 'origin/maint-0.2.2'
2011-03-10 16:11:39 -05:00
Nick Mathewson
48c4d53281
Add a step to the release process: tell trac about the version.
2011-03-10 16:10:53 -05:00
Roger Dingledine
cb3c3c63cb
Merge branch 'maint-0.2.2'
2011-03-08 16:14:53 -05:00
Nick Mathewson
f9bb3ced51
Merge remote branch 'origin/maint-0.2.2'
...
Resolved trivial one-line conflicts.
Conflicts:
src/or/dirserv.c
src/or/rephist.c
2011-03-08 16:10:40 -05:00
Roger Dingledine
dbd4a01756
steps roger takes when making a new release
2011-03-08 16:06:32 -05:00
Roger Dingledine
9c72324ae8
update spec locations
2011-03-08 15:31:04 -05:00
Nick Mathewson
d5907e7d9d
Merge remote branch 'origin/maint-0.2.2'
2011-03-08 15:23:30 -05:00
Roger Dingledine
95edd51116
make nickm's proposed convention from 2003 be gospel
2011-03-08 14:59:30 -05:00
Nick Mathewson
c6d8e75dc3
Merge remote branch 'origin/maint-0.2.2'
2011-03-04 00:25:14 -05:00
Robert Ransom
88e0de9ebb
Fix typo in man page
2011-03-03 10:41:39 -08:00
Nick Mathewson
f16178c08f
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 18:25:16 -05:00
Nick Mathewson
530e87ce31
Add some dollar signs in an attempt to appease older asciidocs
...
We should really require a modern asiidoc: backporting stuff to 8.2 is
a timesink.
2011-02-22 18:24:33 -05:00
Roger Dingledine
108f48dfc7
Merge branch 'maint-0.2.2'
2011-02-22 14:44:32 -05:00
Roger Dingledine
4f730e4f3f
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-02-22 14:44:09 -05:00
Roger Dingledine
0ab62a4dc5
prefer https urls
2011-02-22 14:39:09 -05:00
Nick Mathewson
46b07462ae
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 13:02:42 -05:00
Nick Mathewson
9d5873cdae
Merge branch 'log_domains' into maint-0.2.2
2011-02-22 13:01:02 -05:00
George Kadianakis
ee95430d39
Implement more heartbeat message stuff.
...
(This squashes multiple commits:
* Adds uptime monitoring support.
* Adds circuit counting code.
* Trivially tweaks the documentation.
* Trivial run_scheduled_events() code tweaking.
* Adds a status.h to export functions.
* Added bandwidth monitoring code.
* Added consensus presense detection code.
* Restricts the precision of the bandwidth output.
* Various fixes.
* Fixed style and spacing problems.
* Tidied up src/or/Makefile.am
* Couple of minor fixes on status.c functions.
* 'Implemented' client heartbeat support
)
2011-02-22 12:40:38 -05:00
Sebastian Hahn
098b6ba72d
Initial heartbeat subsystem commit.
...
Sets:
* Documentation
* Logging domain
* Configuration option
* Scheduled event
* Makefile
It also creates status.c and the log_heartbeat() function.
All code was written by Sebastian Hahn. Commit message was
written by me (George Kadianakis).
2011-02-22 12:40:36 -05:00
Nick Mathewson
b99a8d5427
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
doc/spec/Makefile.am
doc/spec/control-spec.txt
doc/spec/dir-spec.txt
doc/spec/proposals/000-index.txt
doc/spec/proposals/001-process.txt
doc/spec/proposals/ideas/xxx-encrypted-services.txt
2011-02-21 16:10:31 -05:00
Nick Mathewson
d673479eba
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
doc/Makefile.am
doc/spec/Makefile.am
doc/spec/address-spec.txt
doc/spec/bridges-spec.txt
doc/spec/control-spec-v0.txt
doc/spec/control-spec.txt
doc/spec/dir-spec-v1.txt
doc/spec/dir-spec-v2.txt
doc/spec/dir-spec.txt
doc/spec/path-spec.txt
doc/spec/proposals/000-index.txt
doc/spec/proposals/001-process.txt
doc/spec/proposals/098-todo.txt
doc/spec/proposals/099-misc.txt
doc/spec/proposals/100-tor-spec-udp.txt
doc/spec/proposals/101-dir-voting.txt
doc/spec/proposals/102-drop-opt.txt
doc/spec/proposals/103-multilevel-keys.txt
doc/spec/proposals/104-short-descriptors.txt
doc/spec/proposals/105-handshake-revision.txt
doc/spec/proposals/106-less-tls-constraint.txt
doc/spec/proposals/107-uptime-sanity-checking.txt
doc/spec/proposals/108-mtbf-based-stability.txt
doc/spec/proposals/109-no-sharing-ips.txt
doc/spec/proposals/110-avoid-infinite-circuits.txt
doc/spec/proposals/111-local-traffic-priority.txt
doc/spec/proposals/112-bring-back-pathlencoinweight.txt
doc/spec/proposals/113-fast-authority-interface.txt
doc/spec/proposals/114-distributed-storage.txt
doc/spec/proposals/115-two-hop-paths.txt
doc/spec/proposals/116-two-hop-paths-from-guard.txt
doc/spec/proposals/117-ipv6-exits.txt
doc/spec/proposals/118-multiple-orports.txt
doc/spec/proposals/119-controlport-auth.txt
doc/spec/proposals/120-shutdown-descriptors.txt
doc/spec/proposals/121-hidden-service-authentication.txt
doc/spec/proposals/122-unnamed-flag.txt
doc/spec/proposals/123-autonaming.txt
doc/spec/proposals/124-tls-certificates.txt
doc/spec/proposals/125-bridges.txt
doc/spec/proposals/126-geoip-reporting.txt
doc/spec/proposals/127-dirport-mirrors-downloads.txt
doc/spec/proposals/128-bridge-families.txt
doc/spec/proposals/129-reject-plaintext-ports.txt
doc/spec/proposals/130-v2-conn-protocol.txt
doc/spec/proposals/131-verify-tor-usage.txt
doc/spec/proposals/132-browser-check-tor-service.txt
doc/spec/proposals/134-robust-voting.txt
doc/spec/proposals/135-private-tor-networks.txt
doc/spec/proposals/137-bootstrap-phases.txt
doc/spec/proposals/138-remove-down-routers-from-consensus.txt
doc/spec/proposals/140-consensus-diffs.txt
doc/spec/proposals/141-jit-sd-downloads.txt
doc/spec/proposals/142-combine-intro-and-rend-points.txt
doc/spec/proposals/143-distributed-storage-improvements.txt
doc/spec/proposals/145-newguard-flag.txt
doc/spec/proposals/146-long-term-stability.txt
doc/spec/proposals/147-prevoting-opinions.txt
doc/spec/proposals/148-uniform-client-end-reason.txt
doc/spec/proposals/149-using-netinfo-data.txt
doc/spec/proposals/150-exclude-exit-nodes.txt
doc/spec/proposals/151-path-selection-improvements.txt
doc/spec/proposals/152-single-hop-circuits.txt
doc/spec/proposals/153-automatic-software-update-protocol.txt
doc/spec/proposals/154-automatic-updates.txt
doc/spec/proposals/155-four-hidden-service-improvements.txt
doc/spec/proposals/156-tracking-blocked-ports.txt
doc/spec/proposals/157-specific-cert-download.txt
doc/spec/proposals/158-microdescriptors.txt
doc/spec/proposals/159-exit-scanning.txt
doc/spec/proposals/ideas/xxx-hide-platform.txt
doc/spec/proposals/ideas/xxx-port-knocking.txt
doc/spec/proposals/ideas/xxx-separate-streams-by-port.txt
doc/spec/proposals/ideas/xxx-what-uses-sha1.txt
doc/spec/proposals/reindex.py
doc/spec/rend-spec.txt
doc/spec/socks-extensions.txt
doc/spec/tor-spec.txt
doc/spec/version-spec.txt
2011-02-21 16:09:23 -05:00
Nick Mathewson
7bdb7d4811
Remove specs from 0.2.1 branch: they have moved to a new repository.
2011-02-21 16:02:16 -05:00
Jacob Appelbaum
2f36489422
latest revision of cert normalization spec
2011-02-21 13:45:57 -05:00
Nick Mathewson
0a69355794
Add fixed string and nonce to prop 176 at suggestion from agl
2011-02-21 13:45:00 -05:00
Jacob Appelbaum
400a5a7ddd
Add TLS/cert normalization spec draft
2011-02-18 16:04:23 -05:00
Jacob Appelbaum
38224f95a6
Quick patch to pluggable transport spec
2011-02-18 16:03:31 -05:00
Nick Mathewson
c1c8f51d77
Add proposal 177: Abstaining from votes on individual flags
2011-02-14 14:22:30 -05:00
Roger Dingledine
6ce217731c
get a proposal i started last month into git
2011-02-14 05:59:43 -05:00
Nick Mathewson
c79a24f505
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-02-10 16:01:29 -05:00
Nick Mathewson
d37660d3f3
Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2
2011-02-10 16:01:19 -05:00
Nick Mathewson
f1a004797e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
doc/tor.1.txt
2011-02-10 15:52:04 -05:00
Robert Ransom
6f07363e72
Document what descriptors HSAuthoritativeDir serves
...
Fixes bug 2089.
2011-02-10 11:06:05 -08:00
Robert Ransom
20d493308a
Update documentation for PublishServerDescriptor (0.2.2.x)
2011-02-09 03:20:43 -08:00
Robert Ransom
5fc6967956
Update documentation for PublishServerDescriptor
2011-02-09 02:33:24 -08:00
Nick Mathewson
3bcba6d716
Merge remote branch 'origin/maint-0.2.2'
2011-02-07 12:51:34 -05:00
Nick Mathewson
fcf3eb03bd
typo in manpage fix
2011-02-07 12:51:20 -05:00
Nick Mathewson
ff5810aea9
Merge remote branch 'origin/maint-0.2.2'
2011-02-07 12:47:04 -05:00
Nick Mathewson
98cef0ac1e
Merge branch 'bug2279' into maint-0.2.2
2011-02-07 12:43:54 -05:00
Nick Mathewson
e854e01d57
Some cleanups to bug2279 messages/docs from rransom
2011-02-07 12:40:43 -05:00
Nick Mathewson
69f7c0385b
Merge remote branch 'origin/maint-0.2.2' for bug2203_rebased
...
There was a merge conflict in routerlist.c due to the new node_t logic.
Conflicts:
src/or/routerlist.c
2011-02-04 12:26:59 -05:00
Nick Mathewson
e9803aa710
Merge branch 'bug2203_rebased' into maint-0.2.2
2011-02-04 12:22:18 -05:00
Nick Mathewson
0fcb677e8a
tweak xxx-pluggable-transport based on comments from sjmurdoch
2011-02-02 15:34:59 -05:00
Nick Mathewson
5815d73f92
Proposal 176: proposed v3 handshake
2011-01-31 21:49:21 -05:00
Nick Mathewson
8d503d79c1
Add suggestion by Nikita to Proposal 171
2011-01-31 17:26:42 -05:00
Sebastian Hahn
f2bb7b17d7
Remove country codes from EntryNodes manpage entry
2011-01-28 14:19:28 +01:00
Nick Mathewson
32dc51258b
Merge remote branch 'karsten/cbtdirspec'
2011-01-26 15:25:51 -05:00
Nick Mathewson
30111a3a01
add documentation for ClientRejectInternalAddresses
2011-01-26 12:08:52 -05:00
Nick Mathewson
0337fc7b06
Merge remote branch 'origin/maint-0.2.2'
2011-01-26 11:49:41 -05:00