Nick Mathewson
00446973f2
Merge remote branch 'sebastian/bug2250' into maint-0.2.2
2011-03-08 16:13:28 -05:00
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
Nick Mathewson
0d78a16c36
Merge remote branch 'sebastian/bug1035' into maint-0.2.2
2011-03-08 15:52:43 -05:00
Nick Mathewson
d5907e7d9d
Merge remote branch 'origin/maint-0.2.2'
2011-03-08 15:23:30 -05:00
Nick Mathewson
9ad083d573
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-08 15:20:48 -05:00
Nick Mathewson
9a6df21539
Avoid crash in any_pending_bridge_descriptor_fetches
...
This is based on shitlei's fix for bug2629, with extra parens removed.
Fixes bug 2629, bugfix on 0.2.1.2-alpha.
2011-03-08 15:17:41 -05:00
Nick Mathewson
26009a3ed0
Merge remote branch 'origin/maint-0.2.2'
2011-03-07 17:12:08 -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
176e8a0a2a
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/routerparse.c
2011-03-06 13:46:11 -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
07b8b439c4
Merge remote branch 'origin/maint-0.2.2'
2011-03-06 13:23:02 -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
fb421c0005
Changes file for ipv6 parsing issue
2011-03-06 13:15:32 -05: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
Robert Ransom
4d21fe2870
Emend changes/tls-hash
2011-03-03 17:54:53 -08:00
Gladys Shufflebottom
49de5431d5
remove tls related hash table code
2011-03-01 18:11:25 -05:00
Sebastian Hahn
5c7c5e593f
Tweak the bug2250 fix slightly
...
Rename the _UsingTestingTorNetwork hidden option to
_UsingTestNetworkDefaults (thanks Nick for the suggestion) and added a
changes file.
2011-03-01 10:05:18 +01:00
Nick Mathewson
42c1a47123
Revert bug1074_launch_authconn* branch: needs more design, less crashing
2011-02-28 12:58:29 -05:00
Nick Mathewson
a47fdaf9a0
Merge branch 'bug1074_launch_conn_on_skew'
...
Fixed conflict on rename of router_get_by_digest->router_get_by_id_digest
Conflicts:
src/or/command.c
2011-02-25 12:12:44 -05:00
Nick Mathewson
22810d740c
Changes file for altf4's bug1074 stuff
2011-02-25 12:12:02 -05:00
Nick Mathewson
a2a8adeee5
Merge remote branch 'origin/maint-0.2.2'
2011-02-25 11:24:35 -05:00
Nick Mathewson
aa178aae03
Merge branch 'bug1863_bwhist' into maint-0.2.2
2011-02-25 11:22:12 -05:00
Nick Mathewson
9265164180
Merge remote branch 'origin/maint-0.2.2'
...
There was a conflict from the node_t transition, but it was an easy fix.
Conflicts:
src/or/circuitbuild.c
2011-02-22 18:41:06 -05:00
Nick Mathewson
16b8b9b00f
Merge remote branch 'arma/bug2403' into maint-0.2.2
2011-02-22 18:38:03 -05:00
Roger Dingledine
a2727f6249
prevent same entry and exit for insane edge case
2011-02-22 17:54:25 -05:00
Nick Mathewson
491abbc65e
Merge remote branch 'public/bug1859_021' into maint-0.2.1
2011-02-22 17:19:41 -05:00
Nick Mathewson
3d4c2ffa30
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 15:58:50 -05:00
Roger Dingledine
e606f19fa3
changes file for removing torspec from the tarball
2011-02-22 15:58:19 -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
Nick Mathewson
b7f201f746
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/policies.c
src/or/policies.h
2011-02-22 14:10:42 -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
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
Nick Mathewson
933ffd536d
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 12:47:47 -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
ce4f879101
Add a changes file for the heartbeat code
2011-02-22 12:41:22 -05:00
Nick Mathewson
0ba69714b4
Merge remote branch 'sebastian/bug2444'
2011-02-22 11:10:57 -05:00
Nick Mathewson
d120ee1c63
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 01:03:06 -05:00
Nick Mathewson
e9fb50c797
Remove changes files that predate current origin/release-0.2.2
2011-02-21 14:22:12 -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
1c5b19a31a
Merge branch 'maint-0.2.2'
2011-02-11 01:21:04 -05: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
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
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
449d895f06
Merge branch 'bug2408-v2-021-common' into bug2408-v2-022
2011-02-09 03:05:21 -08:00
Robert Ransom
7bf06d4a4f
Ignore and warn about "PublishServerDescriptor hidserv"
...
Fixes #2408 .
2011-02-09 02:33:24 -08:00
Nick Mathewson
cc9809c1f7
Merge remote branch 'origin/maint-0.2.2'
2011-02-08 14:37:31 -05:00
Nick Mathewson
d43470ad8a
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-02-08 14:37:02 -05:00
Roger Dingledine
7d2a91f5e5
support multihomed bridges (bug 2510)
2011-02-08 09:10:14 -05:00
Roger Dingledine
9a1a96ba09
don't use old non-configured bridges (bug 2511)
2011-02-08 08:08:47 -05:00
Roger Dingledine
20b75989ac
dtrt when only relaybandwidthburst is set
...
fixes bug 2470
2011-02-07 23:21:33 -05:00
Roger Dingledine
4b6b398cff
Merge branch 'maint-0.2.2'
2011-02-07 22:21:01 -05:00
Roger Dingledine
54ccc80a4a
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-02-07 22:20:35 -05:00
Karsten Loesing
9c2cb6fc89
Update to the February 1 2011 Maxmind GeoLite Country database.
2011-02-07 22:19:37 -05:00
Sebastian Hahn
9b64227ffd
Routers count as down when they change ORPort, too
...
rransom noticed that a change of ORPort is just as bad as a change of IP
address from a client's perspective, because both mean that the relay is
not available to them while the new information hasn't propagated.
Change the bug1035 fix accordingly.
Also make sure we don't log a bridge's IP address (which might happen
when we are the bridge authority).
2011-02-08 00:38:48 +01: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
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
a6c811313a
Merge remote branch 'origin/maint-0.2.2'
2011-02-03 14:21:14 -05:00
Nick Mathewson
f9e251ccf8
changes file for ASLR/DEP build on windows
2011-02-03 14:20:08 -05:00
Nick Mathewson
e94ee583d6
Merge remote branch 'sebastian/bug2450' into maint-0.2.2
2011-02-03 13:59:58 -05:00
Nick Mathewson
912b76a1bf
Merge remote branch 'origin/maint-0.2.2'
2011-02-03 13:56:37 -05:00
Nick Mathewson
2fa9ddb958
Merge remote branch 'public/bug2378' into maint-0.2.2
2011-02-03 13:54:28 -05:00
Sebastian Hahn
f2bb7b17d7
Remove country codes from EntryNodes manpage entry
2011-01-28 14:19:28 +01:00
Sebastian Hahn
490d397dbf
Log which config file we read
...
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.
2011-01-27 15:31:34 +01:00
Nick Mathewson
0337fc7b06
Merge remote branch 'origin/maint-0.2.2'
2011-01-26 11:49:41 -05:00
Nick Mathewson
e6da9a98e9
Merge branch 'bug2181' into maint-0.2.2
2011-01-26 11:46:13 -05:00
Nick Mathewson
d92a415bed
Add an option to disable the block-private-addresses feature
...
Suggested by rransom. Probably necessary for testing network mode.
2011-01-26 11:35:24 -05:00
Nick Mathewson
a880429a76
Merge remote branch 'origin/maint-0.2.2'
2011-01-26 11:08:02 -05:00
Nick Mathewson
ba3b03def0
Merge branch 'bug2409' into maint-0.2.2
2011-01-26 11:06:59 -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
85da676108
Fix double-mark bug when failing to init transparent connection
...
Fixes part of bug 2279. Bugfix on 0.1.2.1-alpha.
2011-01-25 19:07:03 -05:00
Nick Mathewson
5ce8182bdb
Log more about soft-hibernation
2011-01-25 18:45:13 -05:00
Nick Mathewson
e80bdfb4a0
Correctly detect BIO_new failures
...
This bug was noticed by cypherpunks; fixes bug 2378.
Bugfix on svn commit r110.
2011-01-25 18:26:49 -05:00
Nick Mathewson
bfde636aad
Always treat failure to allocate an RSA key as an unrecoverable allocation error
2011-01-25 18:19:09 -05:00
Mike Perry
3ede94159e
Add changelog entry for bug2203.
2011-01-25 17:49:02 -05:00
Nick Mathewson
a38274b1ce
Merge remote branch 'origin/maint-0.2.2'
2011-01-25 17:40:41 -05:00
Nick Mathewson
3d1057c712
Add changes file for bug2004
2011-01-25 17:37:37 -05:00
Nick Mathewson
71862ed763
Fix bug in verifying directory signatures with short digests
...
If we got a signed digest that was shorter than the required digest
length, but longer than 20 bytes, we would accept it as long
enough.... and then immediately fail when we want to check it.
Fixes bug 2409; bug in 0.2.2.20-alpha; found by piebeer.
2011-01-25 17:15:22 -05:00
Nick Mathewson
991b50c5a3
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/geoip.c
2011-01-25 15:58:01 -05:00
Sebastian Hahn
7a446e6754
Tell which geoip file we're parsing
2011-01-25 15:54:51 -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
Nick Mathewson
36880b3f17
Merge remote branch 'origin/maint-0.2.2'
2011-01-25 14:30:01 -05:00
Sebastian Hahn
68f8ca357f
Fix assert for relay/bridge state change
...
When we added support for separate client tls certs on bridges in
a2bb0bfdd5
2011-01-25 14:13:06 -05:00
Nick Mathewson
a1073ee956
Simplest fix to bug2402: do not include SVN versions
...
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.
2011-01-25 14:08:13 -05:00
Nick Mathewson
aaa5737a2e
Merge remote branch 'origin/maint-0.2.2'
2011-01-24 17:51:52 -05:00
Nick Mathewson
5ed73e3807
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.
2011-01-24 16:50:11 -05:00
Nick Mathewson
c496229b0a
Merge remote branch 'origin/maint-0.2.2'
2011-01-20 15:00:42 -05:00
Nick Mathewson
13e9a2b19d
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-20 15:00:24 -05:00
