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
Nick Mathewson
1dd98891d7
Explain soft shutdown mode a little better in the accountingmax documentation
2011-01-26 11:45:37 -05:00
Nick Mathewson
5774ada5d2
Fix typo in dir-spec.txt [found by sebastian]
2011-01-26 11:41:33 -05:00
Nick Mathewson
411ec3c0f8
Add client code to detect attempts to connect to 127.0.0.1 etc
...
We detect and reject said attempts if there is no chosen exit node or
circuit: connecting to a private addr via a randomly chosen exit node
will usually fail (if all exits reject private addresses), is always
ill-defined (you're not asking for any particular host or service),
and usually an error (you've configured all requests to go over Tor
when you really wanted to configure all _remote_ requests to go over
Tor).
This can also help detect forwarding loop requests.
Found as part of bug2279.
2011-01-25 20:39:44 -05:00
Nick Mathewson
ffc3caf8d5
Describe consensus method 11 in dir-spec.txt
2011-01-25 17:49:50 -05:00
Nick Mathewson
89ee779f92
Add a torrc option to report log domains
2011-01-25 15:53:15 -05:00
Nick Mathewson
e261a1a3e6
Simplify syntax for negated log domains
...
Previously if you wanted to say "All messages except network
messages", you needed to say "[*,~net]" and if you said "[~net]" by
mistake, you would get no messages at all. Now, if you say "[~net]",
you get everything except networking messages.
2011-01-25 15:03:36 -05:00
Nick Mathewson
23f8bedddb
Add manpage entry for logging domains
...
Fixes issue 2215.
2011-01-25 15:02:36 -05:00
Karsten Loesing
3bd3437538
List circuit build time related consensus params in dir-spec.txt.
2011-01-19 08:43:33 +01:00
Roger Dingledine
4ff97e3775
Merge branch 'maint-0.2.2'
2011-01-15 22:39:15 -05:00
Sebastian Hahn
a1860cc3f1
Update the spec with the new bounds
2011-01-15 19:50:06 +01:00
Sebastian Hahn
932e5c3cf0
Fix a typo spotted by Roger
2011-01-15 19:42:17 +01:00
Sebastian Hahn
026e7987ad
Sanity-check consensus param values
...
We need to make sure that the worst thing that a weird consensus param
can do to us is to break our Tor (and only if the other Tors are
reliably broken in the same way) so that the majority of directory
authorities can't pull any attacks that are worse than the DoS that
they can trigger by simply shutting down.
One of these worse things was the cbtnummodes parameter, which could
lead to heap corruption on some systems if the value was sufficiently
large.
This commit fixes this particular issue and also introduces sanity
checking for all consensus parameters.
2011-01-15 19:42:17 +01:00
Nick Mathewson
9bbb4a1b40
Merge remote branch 'origin/maint-0.2.2'
2011-01-09 15:43:05 -05:00
Nick Mathewson
732275bb81
Describe tor-resolve defaults. Bug 2364.
2011-01-09 15:40:40 -05:00
Damian Johnson
6661e16e7c
GETINFO options for querying traffic usage
...
This was originally a patch provided by pipe
(http://www.mail-archive.com/or-talk@freehaven.net/msg13085.html ) to
provide a method for controllers to query the total amount of traffic
tor has handled (this is a frequently requested piece of information
by relay operators).
2011-01-07 12:15:14 -05:00
Damian Johnson
8708ffa655
Implementing getinfo options for the pid, uid, user, and descriptor limit as per proposal 173.
2011-01-03 12:04:56 -05:00
Nick Mathewson
d051751d71
Reformat circuit crypto requirements as a proposal-like document
2010-12-14 23:31:42 -05:00
Nick Mathewson
1361376e14
Add start of rransom's notes on tor crypto requirements
2010-12-14 23:22:21 -05:00
Robert Ransom
9776ba7fa4
List another place router identity keys are used.
2010-12-13 22:42:11 -08:00
Robert Ransom
021e4ac07e
Fix typos.
2010-12-13 22:34:10 -08:00
Nick Mathewson
462185d180
Add a proposal-ideas document for crypto migration.
2010-12-13 23:39:54 -05:00
Nick Mathewson
2118028c50
start reformatting and editing the pluggable-transport proposal
2010-12-11 04:18:15 -05:00
Nick Mathewson
1fb3a60f54
convert draft pluggable transport proposal to plaintext
2010-12-10 14:34:26 -05:00
Nick Mathewson
ed0eeed835
Merge branch 'isolated-streams'
...
Conflicts:
doc/spec/proposals/000-index.txt
2010-12-07 11:02:10 -05:00
Nick Mathewson
a1e46c5393
Revise proposal 171 from start to finish
...
The big semantic change is to make the IsolateFoo options exist on a
per-client-port basis.
2010-12-07 11:00:10 -05:00
Karsten Loesing
8db10c6d2f
Write bidirectional connection stats in single line.
...
There's no need to have a separate line conn-stats-end for the end date
and interval length with only a single line conn-bi-direct following.
2010-12-03 16:47:53 +01:00
Karsten Loesing
076a688d76
Add ChangeLog entry and man page entry.
2010-12-03 16:47:52 +01:00
Karsten Loesing
5dfdf075ac
Add metric on uni/bidirectional connection usage.
2010-12-03 16:47:51 +01:00
Nick Mathewson
7ce8f5c621
Merge remote branch 'origin/maint-0.2.2'
2010-12-01 12:45:38 -05:00
Poet (Tim Sally)
31b69027d3
Specified grammars for orconn-status and entry-guards for Tor versions 0.1.2.2-alpha through 0.2.2.1-alpha with feature VERBOSE_NAMES turned off.
2010-12-01 12:44:48 -05:00
Poet (Tim Sally)
45c302efe0
Correct information about support for guards being called helper nodes.
...
The spec stated that support for the helper-nodes command would be removed
in 0.1.3.x, however support for this command is still in Tor. Updated the spec
to reflect this and added a node that the command is deprecated.
2010-12-01 12:44:48 -05:00
Poet (Tim Sally)
87158368dc
Correct grammars to reflect that VERBOSE_NAMES is part of the protocol.
...
Several updates to grammars for events and GETINFO results. All relate
to the fact that LongName has replaced ServerID since 0.2.2.1-alpha. See
documentation of VERBOSE_NAMES for more information. The following
grammars were changed:
* orconn-status GETINFO result
* entry-guards GETINFO result
* Path general token
* OR Connection status changed event
* New descriptors available event
In all cases a note was added about when the old grammar applies.
2010-12-01 12:44:48 -05:00
Poet (Tim Sally)
608bad6e32
Several changes to the way tokens describing servers are documented.
...
(1) Made the wording of the comments consistant with token names.
Digest/Fingerprint and Name/Nickname were being used interchangeably.
Better to just use Fingerprint and Nickname becuase they are the names
of the tokens.
(2) Places the tokens currently in use before the tokens used in older
versions. ServerSpec should be documented before ServerID.
(3) Added a note to the comments about ServerID that cross reference
the VERBOSE_FEATURE, allowing users to see when and why ServerID was
replaced with LongName.
2010-12-01 12:44:48 -05:00
Poet (Tim Sally)
cff180f8b0
Clarify description of FEATURES in control-spec.
...
(1) On by default is a bad way to describe features. Rather, they
are always on and should be viewed as a part of the control
protocol. Updated the wording in USEFEATURE to reflect this.
(2) Made descriptions of Tor versions consistant across all
features. There is the version in which a feature was introduced and
the version in which it became part of the protocol.
(3) Reworded the description of the VERBOSE_NAMES feature. The
previous wording describes the way things used to be first. Better to
lead with the current state of things and then describe how it differs
from old versions.
2010-12-01 12:44:48 -05:00
Nick Mathewson
c4d2a55a88
Rename proposal 171 file
2010-11-27 15:59:08 -05:00
Roger Dingledine
2d6ee53fb9
stop shipping doc/img and doc/website in the tarball
2010-11-23 00:03:50 -05:00
Nick Mathewson
8f74e6ce26
Add some caveats to the signal event
2010-11-19 15:52:10 -05:00
John Brooks
7441999738
Add a SIGNAL event for control connections
...
Implements ticket #1955
2010-11-19 15:49:54 -05:00
Nick Mathewson
8c2affe637
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/cpuworker.c
2010-11-15 14:14:13 -05:00
Nick Mathewson
ac2c0cb587
Make the coducmentation for SingleHop stuff slightly more dire
2010-11-15 14:09:32 -05:00
Nick Mathewson
433a98131a
Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2
2010-11-15 14:07:00 -05:00
Nick Mathewson
3d7772ece3
Merge remote branch 'karsten/enhancement1883'
2010-11-12 14:13:17 -05:00
Nick Mathewson
223fc208f6
Split long lines in configure.in and Makefile.am files
...
Having very long single lines with lots and lots of things in them
tends to make files hard to diff and hard to merge. Since our tools
are one-line-at-a-time, we should try to construct lists that way too,
within reason.
This incidentally turned up a few headers in configure.in that we were
for some reason searching for twice.
2010-11-11 14:22:48 -05:00
Nick Mathewson
2b4ed1d07e
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
2010-11-11 13:59:18 -05:00
Sebastian Hahn
6bde512edc
Document hs dht min uptime change in privnets
...
In f87c6f100d
2010-11-10 15:48:26 +01:00
Sebastian Hahn
bae80eef4b
Document the AllowSingleHopExits option
2010-11-10 15:48:26 +01:00
Sebastian Hahn
0b05f05bbf
Improve documentation for RelayBandwdith* options
...
Jesse Adelman noticed that we don't currently describe what
happens very well.
2010-11-10 15:48:26 +01:00
Sebastian Hahn
6de673076f
Add V3BandwidthsFile to the manpage
2010-11-10 15:48:26 +01:00
Sebastian Hahn
556a1b9e45
Change Natd into NATD in our options.
...
Breaking this out of the last commit because this might be more
controversial.
2010-11-10 15:48:26 +01:00
Sebastian Hahn
87a0e733d1
Fix a typo in the manpage
2010-11-10 15:48:25 +01:00
Sebastian Hahn
fcdf1470c0
Remove everything related to os x expert package
...
We decided to no longer ship expert packages for OS X because they're a
lot of trouble to keep maintained and confuse users. For those who want
a tor on OS X without Vidalia, macports is a fine option. Alternatively,
building from source is easy, too.
The polipo stuff that is still required for the Vidalia bundle build can
now be found in the torbrowser repository,
git://git.torproject.org/torbrowser.git.
2010-11-10 04:04:29 +01:00
Karsten Loesing
423c2a7a27
Add GeoIP file digest to extra-info descriptor.
2010-11-09 09:42:36 +01:00
Nick Mathewson
1fb342dfab
Merge branch 'loggranularity'
2010-11-08 12:40:33 -05:00
Karsten Loesing
ed45bc198f
Fix log granularity based on Nick's comments.
...
Instead of rejecting a value that doesn't divide into 1 second, round to
the nearest divisor of 1 second and warn.
Document that the option only controls the granularity written by Tor to a
file or console log. It does not (for example) "batch up" log messages to
affect times logged by a controller, times attached to syslog messages, or
the mtime fields on log files.
2010-11-08 17:38:59 +01:00
Nick Mathewson
8c837db38f
Merge branch 'nodes'
2010-10-13 16:04:25 -04:00
