 Nick Mathewson
|
67d88a7d60
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
ba0cd8094f
Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
07ab483e62
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
118d8ffdcb
Allow controllers a more up-to-date view of bridge usage.
|
15 years ago |
|
Nick Mathewson
|
09759a66ea
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
 Sebastian Hahn
|
286d44402e
Fix a compile warning on OS X 10.6
|
14 years ago |
|
Nick Mathewson
|
53d02a63df
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
13f60e16eb
Merge remote-tracking branch 'public/bug2381'
|
14 years ago |
|
Nick Mathewson
|
de1c36ff60
Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.
|
14 years ago |
|
Nick Mathewson
|
32341ac467
Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
|
14 years ago |
|
Nick Mathewson
|
f6cc8f0ee3
Add a missing ! to the check for CountPrivatebandwidth.
|
14 years ago |
|
Nick Mathewson
|
1a49fdecf8
Tweaks to Cagara's CountPrivateBandwidth patch:
|
15 years ago |
 Daniel Cagara
|
e61f3293e4
Patch from cagara: Add a CountPrivateBandwidth flag
|
15 years ago |
|
Nick Mathewson
|
3a9d0b4b9c
remove duplicate changes file for 2702
|
15 years ago |
|
Nick Mathewson
|
3cf23be712
Merge branch 'static-work'
|
15 years ago |
|
Nick Mathewson
|
ad1ae44154
Changes file for static-work branch
|
15 years ago |
 Roger Dingledine
|
1587e0d470
Merge branch 'maint-0.2.2'
|
15 years ago |
|
Roger Dingledine
|
9d2b3849b2
Merge branch 'maint-0.2.1' into maint-0.2.2
|
15 years ago |
|
Roger Dingledine
|
0cdd262941
switch to the apr 2011 geoip db
|
15 years ago |
|
Sebastian Hahn
|
e97f78d789
Small fixes for the 2702 implementation
|
15 years ago |
 Jacob Appelbaum
|
fe051a43c1
add --enable-static-tor to our configure script
|
15 years ago |
|
Nick Mathewson
|
ee871e7a0e
Merge remote-tracking branch 'origin/maint-0.2.2'
|
15 years ago |
|
Nick Mathewson
|
65eb0e41ac
Use cbt to tell when to launch parallel intro circuit
|
15 years ago |
|
Nick Mathewson
|
aa950e6c48
Use timevals, not time_t, when expiring circuits.
|
15 years ago |
|
Nick Mathewson
|
5eaba5ac21
Implement replacements for timer(add,cmp,sub) on platforms lacking them.
|
15 years ago |
|
Nick Mathewson
|
22f7042b91
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
|
15 years ago |
 Erinn Clark
|
3a7cee9d29
Fix configure.in zlib package names.
|
15 years ago |
|
Nick Mathewson
|
fc64783278
Send END_STREAM_REASON_NOROUTE: clients that didn't grok it are now obsolete
|
15 years ago |
|
Sebastian Hahn
|
9facf8918f
Improve a few comments
|
15 years ago |
|
Sebastian Hahn
|
8d81831d71
Add a missing cast to silence the compiler
|
15 years ago |
