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
16,850 Commits 53 Branches 631 Tags
60fd08f40be9bfe3e53de4e22b66f25451206f96
Commit Graph
9599 Commits
Author SHA1 Message Date
Nick Mathewson 084c857704 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-19 14:19:19 -04:00
Nick Mathewson de7e99f8bb Merge remote-tracking branch 'public/bug8031' into maint-0.2.4 2013-03-19 14:18:07 -04:00
Nick Mathewson e6602f5991 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-19 14:16:46 -04:00
Nick Mathewson c101ecc8dc Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed' 
Conflicts:
	src/common/util.c
	src/or/entrynodes.h
 2013-03-19 13:25:45 -04:00
Nick Mathewson 4eaca17f2f Merge branch 'bug7582_v2' into maint-0.2.4 2013-03-19 12:29:29 -04:00
Nick Mathewson 73a35dc3c0 Free prepend_policy values in origin circuits 2013-03-19 12:29:08 -04:00
Nick Mathewson 6e94d2fb3a Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 16:36:52 -04:00
Nick Mathewson 597cd893c5 Merge remote-tracking branch 'public/bug6174' into maint-0.2.4 2013-03-18 16:36:25 -04:00
Nick Mathewson b0f7af1615 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 16:34:29 -04:00
Nick Mathewson 01407f9718 Merge remote-tracking branch 'public/bug8062' into maint-0.2.4 2013-03-18 16:33:47 -04:00
Nick Mathewson 899c2805b1 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 15:57:51 -04:00
Nick Mathewson bd9901bef2 Handle TRUNCATE correctly if our next channel isn't done yet. 
Patch from 'cypherpunks'. Fixes bug #7947. Bugfix on 0.0.7.1.
 2013-03-18 15:55:55 -04:00
Nick Mathewson d404b0200f Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 15:46:01 -04:00
Nick Mathewson aa4fcc4f13 Merge remote-tracking branch 'public/bug6164' into maint-0.2.4 2013-03-18 15:45:49 -04:00
Nick Mathewson 5124bc251a Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 15:39:21 -04:00
Nick Mathewson ad8a27a393 Fix some wide lines 2013-03-18 15:39:11 -04:00
Nick Mathewson 67709398b6 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 15:18:56 -04:00
Nick Mathewson 5959d1c105 Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4 2013-03-18 15:17:11 -04:00
Nick Mathewson 41cff47c6a Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 15:16:11 -04:00
Nick Mathewson 3f837d4826 Make stream events for RESOLVE lookups more consistent 
Fixes 8203; patch by Desoxy
 2013-03-18 15:13:59 -04:00
Andrea Shepard 0164f16f70 Improve comment for routers_with_measured_bw static var in dirserv.c 2013-03-18 12:04:41 -07:00
Andrea Shepard e9bdb695e8 Improve comment on router_counts_toward_thresholds() 2013-03-18 11:58:30 -07:00
Andrea Shepard d64e5969f4 Add dirserv_has_measured_bw() predicate wrapper for dirserv_query_measured_bw_cache() 2013-03-18 11:56:42 -07:00
Nick Mathewson f15d9cf5db Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 14:50:36 -04:00
Nick Mathewson 26639b7798 Merge remote-tracking branch 'public/no_dup_guards' into maint-0.2.4 2013-03-18 14:50:01 -04:00
Nick Mathewson 1512747656 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 14:32:18 -04:00
Nick Mathewson 173efa1051 Merge remote-tracking branch 'public/bug8059' into maint-0.2.4 2013-03-18 14:31:50 -04:00
Nick Mathewson a770e1cc22 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 14:30:28 -04:00
Nick Mathewson 63b67577d6 Check return values from fcntl and setsockopt 
(Based on a patch from flupzor; bug #8206)
 2013-03-18 14:28:38 -04:00
Nick Mathewson 3fa9c9b688 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 14:24:30 -04:00
Nick Mathewson eb9420082d Check for 0.2.4.8, not 0.2.4.7, to determine EXTEND2 support 
Fixes bug 8464; bugfix on b2863739 in 0.2.4.8-alpha
 2013-03-18 14:23:19 -04:00
Andrea Shepard f93f7e331b Ignore advertised bandwidths if we have enough measured bandwidths available 2013-03-18 11:15:21 -07:00
Nick Mathewson f48daef299 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-15 12:38:55 -04:00
Nick Mathewson 8b4728ebd6 Merge remote-tracking branch 'public/bug8180_023_v2' into maint-0.2.4 2013-03-15 12:38:11 -04:00
Nick Mathewson 686aaa5c4c Upgrade the warn for EntryNodes without UseEntryGuards to an error 
fixes bug 8180
 2013-03-15 12:34:29 -04:00
Nick Mathewson b163e801bc Merge remote-tracking branch 'origin/maint-0.2.4' 
Conflicts:
	src/or/routerlist.c
 2013-03-15 12:20:17 -04:00
Nick Mathewson 0cf327dc78 Merge remote-tracking branch 'public/unused_stuff' into maint-0.2.4 2013-03-15 12:17:23 -04:00
Nick Mathewson 9be3389dc7 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-14 12:06:58 -04:00
Nick Mathewson 653b09e1ec Make circuit_purpose_to_string handle CIRCUIT_PURPOSE_PATH_BIAS_TESTING 2013-03-14 12:06:03 -04:00
Nick Mathewson 2b22c0aeef On END_REASON_EXITPOLICY, mark circuit as unusable for that address. 
Also, don't call the exit node 'reject *' unless our decision to pick
that node was based on a non-summarized version of that node's exit
policy.

rransom and arma came up with the ideas for this fix.

Fix for 7582; the summary-related part is a bugfix on 0.2.3.2-alpha.
 2013-03-11 23:37:47 -04:00
Nick Mathewson 1eebb56691 Another possible diagnostic for 8031. 
This time, I'm checking whether our calculated offset matches our
real offset, in each case, as we go along.  I don't think this is
the bug, but it can't hurt to check.
 2013-03-11 14:53:41 -04:00
Nick Mathewson 6905c1f60d Check more error codes when writing microdescriptors. 
Possible partial fix, or diagnosis tool, for bug 8031.
 2013-03-11 14:51:18 -04:00
Nick Mathewson d54ccbe9fd Use fds, not stdio, to manage microdescriptor files 
This is part of an attempt to mitigate 8031.
 2013-03-11 14:37:44 -04:00
Nick Mathewson fca578d9b5 Increase link_proto field to 2 bytes 
This should have been 2 bytes all along, since version numbers can
be 16 bits long.  This isn't a live bug, since the call to
is_or_protocol_version_known in channel_tls_process_versions_cell
will reject any version number not in the range 1..4.  Still, let's
fix this before we accidentally start supporting version 256.

Reported pseudonymously. Fixes bug 8062; bugfix on 0.2.0.10-alpha --
specifically, on commit 6fcda529, where during development I
increased the width of a version to 16 bits without changing the
type of link_proto.
 2013-03-11 12:34:14 -04:00
Nick Mathewson b9037521c6 Fix a framing bug when reading versions from a versions cell. 
Our ++ should have been += 2.  This means that we'd accept version
numbers even when they started at an odd position.

This bug should be harmless in practice for so long as every version
number we allow begins with a 0 byte, but if we ever have a version
number starting with 1, 2, 3, or 4, there will be trouble here.

Fix for bug 8059, reported pseudonymously. Bugfix on 0.2.0.10-alpha
-- specifically, commit 6fcda529, where during development I
increased the width of a version to 16 bits without changing the
loop step.
 2013-03-11 12:29:28 -04:00
Roger Dingledine 331e4dcb46 Merge branch 'maint-0.2.4' 2013-03-10 23:42:14 -04:00
Roger Dingledine 0196647970 start part-way through the ssl cert lifetime 
also, snap the start time and end time to a day boundary, since most
certs in the wild seem to do this.
 2013-03-10 23:38:18 -04:00
Roger Dingledine edd6f02273 randomize SSLKeyLifetime by default 
resolves ticket 8443.
 2013-03-10 23:38:18 -04:00
Roger Dingledine 599aeef9bc parameterize SSLKeyLifetime 
no actual changes in behavior yet
 2013-03-10 23:38:18 -04:00
Nick Mathewson aa3126b5b4 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-10 23:03:17 -04:00