Nick Mathewson
|
01af92fede
|
Merge remote-tracking branch 'origin/maint-0.2.4'
|
2013-03-19 14:27:00 -04:00 |
|
Nick Mathewson
|
8d29866bec
|
Merge remote-tracking branch 'public/bug8002' into maint-0.2.4
|
2013-03-19 14:26:45 -04:00 |
|
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
|
dbdc99483d
|
Merge branch 'bug7947' into maint-0.2.4
|
2013-03-18 15:56:55 -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
|
e5b79b5bb5
|
Merge remote-tracking branch 'origin/maint-0.2.4'
|
2013-03-18 15:44:45 -04:00 |
|
Nick Mathewson
|
0b827cbcb1
|
Fix another case of bug 8206; patch from flupzor
|
2013-03-18 15:44:23 -04:00 |
|
Nick Mathewson
|
19d6650f81
|
Merge remote-tracking branch 'origin/maint-0.2.4'
|
2013-03-18 15:41:14 -04:00 |
|
Nick Mathewson
|
eff1cfaaf7
|
Merge remote-tracking branch 'public/bug6673' into maint-0.2.4
|
2013-03-18 15:40:50 -04:00 |
|
Nick Mathewson
|
c8c86c9b23
|
Fix a double-newline
|
2013-03-18 15:39:47 -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
|
a88f3e24ea
|
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/test/test_addr.c
|
2013-03-18 15:29:32 -04:00 |
|
Nick Mathewson
|
2ac66e59f7
|
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/test/test_addr.c
|
2013-03-18 15:28:39 -04:00 |
|
Nick Mathewson
|
ebb95d0f78
|
Merge remote-tracking branch 'public/bug8377' into maint-0.2.3
|
2013-03-18 15:27:50 -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 |
|
Nick Mathewson
|
617d71a639
|
Merge remote-tracking branch 'origin/maint-0.2.4'
|
2013-03-18 15:07:17 -04:00 |
|
Nick Mathewson
|
7e9b6a19d4
|
Merge remote-tracking branch 'public/bug8290' into maint-0.2.4
|
2013-03-18 15:07:02 -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
|
57ffef3f89
|
Remove an unused local variable.
|
2013-03-18 14:30:11 -04:00 |
|
Nick Mathewson
|
3894efc760
|
Merge branch 'bug8206_squashed' into maint-0.2.4
|
2013-03-18 14:29:12 -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 |
|