66d52b876a
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-20 10:52:49 -04:00
90d2162f32
Merge commit '2f98bf5c9fac4dfd1bb07564ce08b13d1e330252' into maint-0.2.4
...
(This is the part of the Bug 8042 patch that warns about unsigned time_t)
2013-03-20 10:52:26 -04:00
80c987fbb4
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-20 10:34:31 -04:00
5b0b51ca3f
Merge remote-tracking branch 'public/bug6304_v3' into maint-0.2.4
...
Conflicts:
src/or/circuitbuild.c
src/or/config.c
2013-03-20 10:31:56 -04:00
96d39fd236
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-19 16:44:00 -04:00
f1caa2f214
Merge branch 'bug7350_redux' into maint-0.2.4
2013-03-19 16:43:00 -04:00
ca50fb4f81
Don't assert when writing a cell to a CLOSING connection.
...
Instead, drop the cell.
Fixes another case of bug 7350; bugfix on 0.2.4.4-alpha
2013-03-19 16:35:40 -04:00
96e8e30ee3
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-19 16:17:42 -04:00
323cb655be
Merge remote-tracking branch 'public/bug7164_diagnostic' into maint-0.2.4
2013-03-19 16:16:48 -04:00
c547502ecb
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-19 16:15:39 -04:00
6f20a74d52
Merge branch 'bug8240_v2_squashed' into maint-0.2.4
...
Conflicts:
doc/tor.1.txt
src/or/circuitbuild.c
src/or/config.c
src/or/or.h
2013-03-19 16:15:27 -04:00
18752bca5b
Drop the minimum guard lifetime back down to one month
...
Mike believes that raising the default to 2 months with no way to lower
it may create horrible load-balancing issues.
2013-03-19 16:04:40 -04:00
cf734a08f6
Add support for days of the week to intervals
2013-03-19 16:03:58 -04:00
aa040619d5
Document the GuardLifetime option
2013-03-19 16:03:57 -04:00
343f7aa059
Make the guard lifetime configurable and adjustable via the consensus
...
Fixes 8240.
(Don't actually increase the default guard lifetime. It seems likely to
break too many things if done precipitiously.)
2013-03-19 16:02:19 -04:00
acbfc9c8cc
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-19 15:32:44 -04:00
a7b46336eb
Merge remote-tracking branch 'public/bug7950' into maint-0.2.4
2013-03-19 15:32:17 -04:00
60fd08f40b
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-19 15:13:07 -04:00
60d1442136
Merge remote-tracking branch 'public/bug7768' into maint-0.2.4
2013-03-19 15:11:47 -04:00
6fe4e24645
Use --test-commandline name in tor-fw-helper manpage
2013-03-19 15:11:34 -04:00
03efe54027
Use option name --test-commandline in tor-fw-helper.
...
It was previously --Test in the help output and --test-commandline in
the getopt call. The man page already had --test.
(Originally by David, who resolved the tie in favor of "--test"; I
chose --test-commandline" instead so that nothing that depended
on it could break. -Nick)
2013-03-19 15:09:44 -04:00
01af92fede
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-19 14:27:00 -04:00
8d29866bec
Merge remote-tracking branch 'public/bug8002' into maint-0.2.4
2013-03-19 14:26:45 -04:00
084c857704
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-19 14:19:19 -04:00
de7e99f8bb
Merge remote-tracking branch 'public/bug8031' into maint-0.2.4
2013-03-19 14:18:07 -04:00
e6602f5991
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-19 14:16:46 -04:00
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
4eaca17f2f
Merge branch 'bug7582_v2' into maint-0.2.4
2013-03-19 12:29:29 -04:00
73a35dc3c0
Free prepend_policy values in origin circuits
2013-03-19 12:29:08 -04:00
6e94d2fb3a
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-18 16:36:52 -04:00
597cd893c5
Merge remote-tracking branch 'public/bug6174' into maint-0.2.4
2013-03-18 16:36:25 -04:00
b0f7af1615
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-18 16:34:29 -04:00
01407f9718
Merge remote-tracking branch 'public/bug8062' into maint-0.2.4
2013-03-18 16:33:47 -04:00
899c2805b1
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-18 15:57:51 -04:00
dbdc99483d
Merge branch 'bug7947' into maint-0.2.4
2013-03-18 15:56:55 -04:00
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
d404b0200f
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-18 15:46:01 -04:00
aa4fcc4f13
Merge remote-tracking branch 'public/bug6164' into maint-0.2.4
2013-03-18 15:45:49 -04:00
e5b79b5bb5
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-18 15:44:45 -04:00
0b827cbcb1
Fix another case of bug 8206; patch from flupzor
2013-03-18 15:44:23 -04:00
19d6650f81
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-18 15:41:14 -04:00
eff1cfaaf7
Merge remote-tracking branch 'public/bug6673' into maint-0.2.4
2013-03-18 15:40:50 -04:00
c8c86c9b23
Fix a double-newline
2013-03-18 15:39:47 -04:00
5124bc251a
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-18 15:39:21 -04:00
ad8a27a393
Fix some wide lines
2013-03-18 15:39:11 -04:00
a88f3e24ea
Merge remote-tracking branch 'origin/maint-0.2.4'
...
Conflicts:
src/test/test_addr.c
2013-03-18 15:29:32 -04:00
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
ebb95d0f78
Merge remote-tracking branch 'public/bug8377' into maint-0.2.3
2013-03-18 15:27:50 -04:00
67709398b6
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-18 15:18:56 -04:00
5959d1c105
Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4
2013-03-18 15:17:11 -04:00
Nick Mathewson
David Fifield