Roger Dingledine
95edd51116
make nickm's proposed convention from 2003 be gospel
2011-03-08 14:59:30 -05:00
Nick Mathewson
3bd83b8fb6
Merge remote branch 'sebastian/bug2660' into maint-0.2.2
2011-03-07 17:09:23 -05:00
Nick Mathewson
35fcec3880
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-06 13:42:28 -05:00
Nick Mathewson
4fa70e11ed
Merge branch 'real_ipv6_fix' into maint-0.2.1
2011-03-06 13:42:05 -05:00
Nick Mathewson
2ce132e335
Oops, here's the *REAL* fix for the ipv6 issue
...
We need to _REJECT_ descriptors with accept6/reject6 lines. If we
let them onto the network , other un-upgraded tors will crash.
2011-03-06 13:41:55 -05:00
Nick Mathewson
0f637492e3
Merge branch 'careful_with_all_descs' into maint-0.2.1
2011-03-06 13:35:42 -05:00
Nick Mathewson
b231026c42
changes file for careful_with_all_descs
2011-03-06 13:35:24 -05:00
Nick Mathewson
3da0837b0b
Revert "Disallow reject6 and accept6 lines in descriptors"
...
This reverts commit b3918b3bbb
2011-03-06 13:26:38 -05:00
Nick Mathewson
ed14888e7e
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/or/policies.c
2011-03-06 13:20:21 -05:00
Nick Mathewson
8b01fd7bad
exit_policy_is_general_exit is IPv4 only; it should admit it.
2011-03-06 13:16:53 -05:00
Nick Mathewson
fb421c0005
Changes file for ipv6 parsing issue
2011-03-06 13:15:32 -05:00
Sebastian Hahn
9f614507b6
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-06 18:25:44 +01:00
Sebastian Hahn
b3918b3bbb
Disallow reject6 and accept6 lines in descriptors
...
This fixes a remotely triggerable assert on directory authorities, who
don't handle descriptors with ipv6 contents well yet. We will want to
revert this once we're ready to handle ipv6.
Issue raised by lorth on #tor, who wasn't able to use Tor anymore.
Analyzed with help from Christian Fromme. Fix suggested by arma. Bugfix
on 0.2.1.3-alpha.
2011-03-06 18:20:28 +01:00
Sebastian Hahn
f83debb51d
Fix setting target port in get_interface_address6
...
We want to use the discard port correctly, so a htons() was missing.
Also we need to set it correctly depending on address family.
Review provided by danieldg
2011-03-05 16:58:20 +01:00
Sebastian Hahn
865ea5d263
Fix connect() failures in get_interface_address6()
...
The third argument for connect should be dependent on the address
family. Issue spotted by piebeer who also wrote the patch.
2011-03-05 16:57:05 +01:00
Nick Mathewson
bcbc8c51cb
Do not serve encrypt-only descriptors with the "all" request. Reported by piebeer
2011-03-04 00:04:25 -05:00
Nick Mathewson
1d6af67ab8
Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2
2011-03-03 13:50:17 -05:00
Robert Ransom
88e0de9ebb
Fix typo in man page
2011-03-03 10:41:39 -08:00
Nick Mathewson
6b7408178b
Avoid spurious bwhist parsing failures
...
This should fix a bug that special ran into, where if your state file
didn't record period maxima, it would never decide that it had
successfully parsed itself unless you got lucky with your
uninitialized-variable values.
This patch also tries to improve error messags in the case where a
maximum value legitimately doesn't parse.
2011-03-01 17:08:02 -05:00
Nick Mathewson
aa178aae03
Merge branch 'bug1863_bwhist' into maint-0.2.2
2011-02-25 11:22:12 -05:00
Karsten Loesing
0642b92792
Fix two potential bugs in the bug1863 code.
2011-02-24 16:44:54 +01:00
Nick Mathewson
16b8b9b00f
Merge remote branch 'arma/bug2403' into maint-0.2.2
2011-02-22 18:38:03 -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
a2727f6249
prevent same entry and exit for insane edge case
2011-02-22 17:54:25 -05:00
Nick Mathewson
596f7a39b6
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
configure.in
2011-02-22 17:53:09 -05:00
Nick Mathewson
10ad3442e1
Remove doc/spec/Makefile.in from list of generated files
2011-02-22 17:51:03 -05:00
Nick Mathewson
06deec15c9
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
(This is an "ours" merge of the code for bug1859 backported to 0.2.1.)
2011-02-22 17:20:59 -05:00
Nick Mathewson
491abbc65e
Merge remote branch 'public/bug1859_021' into maint-0.2.1
2011-02-22 17:19:41 -05:00
Roger Dingledine
e606f19fa3
changes file for removing torspec from the tarball
2011-02-22 15:58:19 -05:00
Nick Mathewson
84cdcc68a9
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Use "ours" strategy" to avoid taking bug2402 fix.
2011-02-22 15:57:55 -05:00
Nick Mathewson
7605985b3f
Merge remote branch 'public/bug2402_nothing' into maint-0.2.1
2011-02-22 15:54:13 -05:00
Roger Dingledine
372773d681
changes file for removing torspec from the tarball
2011-02-22 14:50:00 -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
cdc59c198a
Don't let bad DNS make exit policy and declared exit policy get out of sync
...
Patch from "postman" on trac. Fixes bg 2366. Bug on 0.1.2.5-alpha.
2011-02-22 14:06:28 -05:00
Nick Mathewson
9d5873cdae
Merge branch 'log_domains' into maint-0.2.2
2011-02-22 13:01:02 -05:00
Nick Mathewson
ce149c1022
That shalt also not have a label without a statement.
2011-02-22 12:52:52 -05:00
Nick Mathewson
613073e449
Merge remote branch 'sebastian/bug2504' into maint-0.2.2
2011-02-22 12:47:21 -05:00
Nick Mathewson
19e5b4c2f2
Merge remote branch 'rransom/bug2572' into maint-0.2.2
2011-02-22 01:02:35 -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
Robert Ransom
444a955e4a
Don't crash a bridge authority on SIGHUP if it's not in the consensus
...
Fixes bug 2572.
2011-02-16 04:12:37 -08:00
Sebastian Hahn
5dbaf9dbd5
Windows has EACCES, not EACCESS
...
Once again spotted by mobmix
Also add a changes file for the fix
2011-02-11 17:02:26 +01:00
Roger Dingledine
9b745cdbf9
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-02-11 01:20:47 -05:00
Roger Dingledine
28de4d83fd
fix the other half of bug 1074
2011-02-10 17:11:06 -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
7abb74e4ac
Merge maint-0.2.1 with -s ours.
2011-02-10 15:56:06 -05:00
Nick Mathewson
50c259d763
Make the DH parameter we use for TLS match the one from Apache's mod_ssl
...
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 5ed73e3807
2011-02-10 15:55:06 -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
