f16178c08f
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 18:25:16 -05:00
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
108f48dfc7
Merge branch 'maint-0.2.2'
2011-02-22 14:44:32 -05:00
4f730e4f3f
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-02-22 14:44:09 -05:00
0ab62a4dc5
prefer https urls
2011-02-22 14:39:09 -05:00
46b07462ae
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 13:02:42 -05:00
9d5873cdae
Merge branch 'log_domains' into maint-0.2.2
2011-02-22 13:01:02 -05:00
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
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
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
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
7bdb7d4811
Remove specs from 0.2.1 branch: they have moved to a new repository.
2011-02-21 16:02:16 -05:00
2f36489422
latest revision of cert normalization spec
2011-02-21 13:45:57 -05:00
0a69355794
Add fixed string and nonce to prop 176 at suggestion from agl
2011-02-21 13:45:00 -05:00
400a5a7ddd
Add TLS/cert normalization spec draft
2011-02-18 16:04:23 -05:00
38224f95a6
Quick patch to pluggable transport spec
2011-02-18 16:03:31 -05:00
c1c8f51d77
Add proposal 177: Abstaining from votes on individual flags
2011-02-14 14:22:30 -05:00
6ce217731c
get a proposal i started last month into git
2011-02-14 05:59:43 -05:00
c79a24f505
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-02-10 16:01:29 -05:00
d37660d3f3
Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2
2011-02-10 16:01:19 -05:00
f1a004797e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
doc/tor.1.txt
2011-02-10 15:52:04 -05:00
6f07363e72
Document what descriptors HSAuthoritativeDir serves
...
Fixes bug 2089.
2011-02-10 11:06:05 -08:00
20d493308a
Update documentation for PublishServerDescriptor (0.2.2.x)
2011-02-09 03:20:43 -08:00
5fc6967956
Update documentation for PublishServerDescriptor
2011-02-09 02:33:24 -08:00
3bcba6d716
Merge remote branch 'origin/maint-0.2.2'
2011-02-07 12:51:34 -05:00
fcf3eb03bd
typo in manpage fix
2011-02-07 12:51:20 -05:00
ff5810aea9
Merge remote branch 'origin/maint-0.2.2'
2011-02-07 12:47:04 -05:00
98cef0ac1e
Merge branch 'bug2279' into maint-0.2.2
2011-02-07 12:43:54 -05:00
e854e01d57
Some cleanups to bug2279 messages/docs from rransom
2011-02-07 12:40:43 -05:00
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
e9803aa710
Merge branch 'bug2203_rebased' into maint-0.2.2
2011-02-04 12:22:18 -05:00
0fcb677e8a
tweak xxx-pluggable-transport based on comments from sjmurdoch
2011-02-02 15:34:59 -05:00
5815d73f92
Proposal 176: proposed v3 handshake
2011-01-31 21:49:21 -05:00
8d503d79c1
Add suggestion by Nikita to Proposal 171
2011-01-31 17:26:42 -05:00
f2bb7b17d7
Remove country codes from EntryNodes manpage entry
2011-01-28 14:19:28 +01:00
32dc51258b
Merge remote branch 'karsten/cbtdirspec'
2011-01-26 15:25:51 -05:00
30111a3a01
add documentation for ClientRejectInternalAddresses
2011-01-26 12:08:52 -05:00
0337fc7b06
Merge remote branch 'origin/maint-0.2.2'
2011-01-26 11:49:41 -05:00
1dd98891d7
Explain soft shutdown mode a little better in the accountingmax documentation
2011-01-26 11:45:37 -05:00
5774ada5d2
Fix typo in dir-spec.txt [found by sebastian]
2011-01-26 11:41:33 -05:00
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
ffc3caf8d5
Describe consensus method 11 in dir-spec.txt
2011-01-25 17:49:50 -05:00
89ee779f92
Add a torrc option to report log domains
2011-01-25 15:53:15 -05:00
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
23f8bedddb
Add manpage entry for logging domains
...
Fixes issue 2215.
2011-01-25 15:02:36 -05:00
3bd3437538
List circuit build time related consensus params in dir-spec.txt.
2011-01-19 08:43:33 +01:00
4ff97e3775
Merge branch 'maint-0.2.2'
2011-01-15 22:39:15 -05:00
a1860cc3f1
Update the spec with the new bounds
2011-01-15 19:50:06 +01:00
932e5c3cf0
Fix a typo spotted by Roger
2011-01-15 19:42:17 +01:00
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
Roger Dingledine
George Kadianakis
Sebastian Hahn
Jacob Appelbaum
Robert Ransom
Karsten Loesing