Nick Mathewson
|
66d52b876a
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 years ago |
Nick Mathewson
|
90d2162f32
Merge commit '2f98bf5c9fac4dfd1bb07564ce08b13d1e330252' into maint-0.2.4
|
11 years ago |
Nick Mathewson
|
80c987fbb4
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 years ago |
Nick Mathewson
|
5b0b51ca3f
Merge remote-tracking branch 'public/bug6304_v3' into maint-0.2.4
|
11 years ago |
Nick Mathewson
|
96d39fd236
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 years ago |
Nick Mathewson
|
f1caa2f214
Merge branch 'bug7350_redux' into maint-0.2.4
|
11 years ago |
Nick Mathewson
|
ca50fb4f81
Don't assert when writing a cell to a CLOSING connection.
|
11 years ago |
Nick Mathewson
|
96e8e30ee3
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 years ago |
Nick Mathewson
|
323cb655be
Merge remote-tracking branch 'public/bug7164_diagnostic' into maint-0.2.4
|
11 years ago |
Nick Mathewson
|
c547502ecb
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 years ago |
Nick Mathewson
|
6f20a74d52
Merge branch 'bug8240_v2_squashed' into maint-0.2.4
|
11 years ago |
Nick Mathewson
|
18752bca5b
Drop the minimum guard lifetime back down to one month
|
11 years ago |
Nick Mathewson
|
cf734a08f6
Add support for days of the week to intervals
|
11 years ago |
Nick Mathewson
|
aa040619d5
Document the GuardLifetime option
|
11 years ago |
Nick Mathewson
|
343f7aa059
Make the guard lifetime configurable and adjustable via the consensus
|
11 years ago |
Nick Mathewson
|
acbfc9c8cc
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 years ago |
Nick Mathewson
|
a7b46336eb
Merge remote-tracking branch 'public/bug7950' into maint-0.2.4
|
11 years ago |
Nick Mathewson
|
60fd08f40b
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 years ago |
Nick Mathewson
|
60d1442136
Merge remote-tracking branch 'public/bug7768' into maint-0.2.4
|
11 years ago |
Nick Mathewson
|
6fe4e24645
Use --test-commandline name in tor-fw-helper manpage
|
11 years ago |
David Fifield
|
03efe54027
Use option name --test-commandline in tor-fw-helper.
|
11 years ago |
Nick Mathewson
|
01af92fede
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 years ago |
Nick Mathewson
|
8d29866bec
Merge remote-tracking branch 'public/bug8002' into maint-0.2.4
|
11 years ago |
Nick Mathewson
|
084c857704
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 years ago |
Nick Mathewson
|
de7e99f8bb
Merge remote-tracking branch 'public/bug8031' into maint-0.2.4
|
11 years ago |
Nick Mathewson
|
e6602f5991
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 years ago |
Nick Mathewson
|
c101ecc8dc
Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed'
|
11 years ago |
Nick Mathewson
|
4eaca17f2f
Merge branch 'bug7582_v2' into maint-0.2.4
|
11 years ago |
Nick Mathewson
|
73a35dc3c0
Free prepend_policy values in origin circuits
|
11 years ago |
Nick Mathewson
|
6e94d2fb3a
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 years ago |