summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | changes file for removing torspec from the tarballRoger Dingledine2011-02-22
| | | | | | | | | |
| * | | | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-02-22
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | / / / / / / | | |_|/ / / / / / | |/| | | | | | | Use "ours" strategy" to avoid taking bug2402 fix.
| | * | | | | | | Merge remote branch 'public/bug2402_nothing' into maint-0.2.1Nick Mathewson2011-02-22
| | |\ \ \ \ \ \ \
| | | * | | | | | | Simplest fix to bug2402: do not include SVN versionsNick Mathewson2011-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we stopped using svn, 0.2.1.x lost the ability to notice its svn revision and report it in the version number. However, it kept looking at the micro-revision.i file... so if you switched to master, built tor, then switched to 0.2.1.x, you'd get a micro-revision.i file from master reported as an SVN tag. This patch takes out the "include the svn tag" logic entirely. Bugfix on 0.2.1.15-rc; fixes bug 2402.
| | * | | | | | | | changes file for removing torspec from the tarballRoger Dingledine2011-02-22
| | | | | | | | | |
* | | | | | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-02-22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-02-22
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | prefer https urlsRoger Dingledine2011-02-22
| | | | | | | | | |
* | | | | | | | | | Merge remote branch 'sebastian/bug2496'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't tell Tor client users about missing geoipSebastian Hahn2011-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They don't need the geoip file for stats, so a missing geoipfile is not a big issue. Also make the log message a bit friendlier. Fixes bug 2496.
* | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/policies.c src/or/policies.h
| * | | | | | | | | | Don't let bad DNS make exit policy and declared exit policy get out of syncNick Mathewson2011-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from "postman" on trac. Fixes bg 2366. Bug on 0.1.2.5-alpha.
* | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'log_domains' into maint-0.2.2Nick Mathewson2011-02-22
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | That shalt also not have a label without a statement.Nick Mathewson2011-02-22
| | | | | | | | | | | |
| | * | | | | | | | | | Thou shalt not overflow even stupidly small buffersRobert Ransom2011-02-04
| | | | | | | | | | | |
| | * | | | | | | | | | Add a torrc option to report log domainsNick Mathewson2011-01-25
| | | | | | | | | | | |
| | * | | | | | | | | | Simplify syntax for negated log domainsNick Mathewson2011-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | | | | | Add manpage entry for logging domainsNick Mathewson2011-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue 2215.
* | | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge remote branch 'sebastian/bug2504' into maint-0.2.2Nick Mathewson2011-02-22
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Windows has EACCES, not EACCESSSebastian Hahn2011-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once again spotted by mobmix Also add a changes file for the fix
* | | | | | | | | | | | | Add a changes file for the heartbeat codeNick Mathewson2011-02-22
| | | | | | | | | | | | |
* | | | | | | | | | | | | Tweak some names and comments in asn's heartbeat patchNick Mathewson2011-02-22
| | | | | | | | | | | | |
* | | | | | | | | | | | | Implement more heartbeat message stuff.George Kadianakis2011-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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 )
* | | | | | | | | | | | | Initial heartbeat subsystem commit.Sebastian Hahn2011-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | | | | | | | | Merge remote branch 'sebastian/bug2444'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Log which config file we readSebastian Hahn2011-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is often not entirely clear what options Tor was built with, so it might not be immediately obvious which config file Tor is using when it found one. Log the config file at startup.
* | | | | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote branch 'rransom/bug2572' into maint-0.2.2Nick Mathewson2011-02-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Don't crash a bridge authority on SIGHUP if it's not in the consensusRobert Ransom2011-02-16
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 2572.
* | | | | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-02-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | / / / / / / / / | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | Remove specs from 0.2.1 branch: they have moved to a new repository.Nick Mathewson2011-02-21
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add a perl script to find changes files that have already been merged into ↵Nick Mathewson2011-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-0.2.2
* | | | | | | | | | | | | Remove changes files that predate current origin/release-0.2.2Nick Mathewson2011-02-21
| | | | | | | | | | | | |
* | | | | | | | | | | | | latest revision of cert normalization specJacob Appelbaum2011-02-21
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add fixed string and nonce to prop 176 at suggestion from aglNick Mathewson2011-02-21
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add TLS/cert normalization spec draftJacob Appelbaum2011-02-18
| | | | | | | | | | | | |
* | | | | | | | | | | | | Quick patch to pluggable transport specJacob Appelbaum2011-02-18
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add proposal 177: Abstaining from votes on individual flagsNick Mathewson2011-02-14
| | | | | | | | | | | | |
* | | | | | | | | | | | | get a proposal i started last month into gitRoger Dingledine2011-02-14
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-02-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-02-11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | fix the other half of bug 1074Roger Dingledine2011-02-10
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2Nick Mathewson2011-02-10
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Document what descriptors HSAuthoritativeDir servesRobert Ransom2011-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 2089.
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /