torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,920 Commits 53 Branches 631 Tags
b99a8d54271dfd26c5c3a2d3086226974b32373e
Commit Graph

446 Commits

Author SHA1 Message Date
Nick Mathewson e9fb50c797 Remove changes files that predate current origin/release-0.2.2 2011-02-21 14:22:12 -05: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 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
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
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 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 we forgot to correctly initialize this when changing
from relay to bridge or vice versa while Tor is running. Fix that
by always initializing keys when the state changes.

Fixes bug 2433.
 2011-01-25 14:13:06 -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
Nick Mathewson 1471e57743 Merge remote branch 'rransom/policy_summarize-assert' into maint-0.2.1 2011-01-20 14:59:23 -05:00
Robert Ransom 43414eb988 Fix bounds-checking in policy_summarize 
Found by piebeer.
 2011-01-20 11:17:57 -08:00
Nick Mathewson f6a25a995e Merge remote branch 'origin/maint-0.2.2' 2011-01-19 13:26:23 -05:00
Nick Mathewson a793f1f6f2 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 2011-01-19 13:25:38 -05:00