summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-22Initial heartbeat subsystem commit.Sebastian Hahn
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-22Merge remote branch 'sebastian/bug2444'Nick Mathewson
2011-02-22Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-02-22Merge remote branch 'rransom/bug2572' into maint-0.2.2Nick Mathewson
2011-02-21Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
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-21Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
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-21Remove specs from 0.2.1 branch: they have moved to a new repository.Nick Mathewson
2011-02-21Add a perl script to find changes files that have already been merged into ↵Nick Mathewson
release-0.2.2
2011-02-21Remove changes files that predate current origin/release-0.2.2Nick Mathewson
2011-02-21latest revision of cert normalization specJacob Appelbaum
2011-02-21Add fixed string and nonce to prop 176 at suggestion from aglNick Mathewson
2011-02-18Add TLS/cert normalization spec draftJacob Appelbaum
2011-02-18Quick patch to pluggable transport specJacob Appelbaum
2011-02-16Don't crash a bridge authority on SIGHUP if it's not in the consensusRobert Ransom
Fixes bug 2572.
2011-02-14Add proposal 177: Abstaining from votes on individual flagsNick Mathewson
2011-02-14get a proposal i started last month into gitRoger Dingledine
2011-02-11Merge branch 'maint-0.2.2'Roger Dingledine
2011-02-11Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-02-10fix the other half of bug 1074Roger Dingledine
2011-02-10Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-02-10Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2Nick Mathewson
2011-02-10Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-02-10Merge maint-0.2.1 with -s ours.Nick Mathewson
2011-02-10Make the DH parameter we use for TLS match the one from Apache's mod_sslNick Mathewson
Our regular DH parameters that we use for circuit and rendezvous crypto are unchanged. This is yet another small step on the path of protocol fingerprinting resistance. (Backport from 0.2.2's 5ed73e3807d90dd0a3)
2011-02-10Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: doc/tor.1.txt
2011-02-10Document what descriptors HSAuthoritativeDir servesRobert Ransom
Fixes bug 2089.
2011-02-09Update documentation for PublishServerDescriptor (0.2.2.x)Robert Ransom
2011-02-09Merge branch 'bug2408-v2-021' into bug2408-v2-022 (keep-ours)Robert Ransom
2011-02-09Merge branch 'bug2408-v2-021-common' into bug2408-v2-022Robert Ransom
2011-02-09Update documentation for PublishServerDescriptorRobert Ransom
2011-02-09Ignore and warn about "PublishServerDescriptor hidserv"Robert Ransom
Fixes #2408.
2011-02-08Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-02-08Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-02-08Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-02-08Locking failures on windows are indicated by EACCESSebastian Hahn
Patch our implementation of tor_lockfile_lock() to handle this case correctly. Also add a note that blocking behaviour differs from windows to *nix. Fixes bug 2504, issue pointed out by mobmix.
2011-02-07move the clause above the "if bw is too low" checkRoger Dingledine
2011-02-07dtrt when only relaybandwidthburst is setRoger Dingledine
fixes bug 2470
2011-02-07forward-port the 0.2.2.22-alpha changelogRoger Dingledine
2011-02-07Merge branch 'maint-0.2.2'Roger Dingledine
2011-02-07Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-02-07Update to the February 1 2011 Maxmind GeoLite Country database.Karsten Loesing
2011-02-07Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-02-07typo in manpage fixNick Mathewson
2011-02-07Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-02-07Merge branch 'bug2279' into maint-0.2.2Nick Mathewson
2011-02-07Some cleanups to bug2279 messages/docs from rransomNick Mathewson
2011-02-07another api tweak to help task 1944Roger Dingledine
2011-02-07change APIs slightly to make #1944 easierRoger Dingledine
2011-02-04Merge remote branch 'origin/maint-0.2.2' for bug2203_rebasedNick Mathewson
There was a merge conflict in routerlist.c due to the new node_t logic. Conflicts: src/or/routerlist.c
2011-02-04Merge branch 'bug2203_rebased' into maint-0.2.2Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion