 Nick Mathewson
|
53d02a63df
Merge remote-tracking branch 'origin/maint-0.2.2'
|
15 lat temu |
|
Nick Mathewson
|
13f60e16eb
Merge remote-tracking branch 'public/bug2381'
|
15 lat temu |
|
Nick Mathewson
|
de1c36ff60
Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.
|
15 lat temu |
|
Nick Mathewson
|
32341ac467
Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
|
15 lat temu |
|
Nick Mathewson
|
f6cc8f0ee3
Add a missing ! to the check for CountPrivatebandwidth.
|
15 lat temu |
|
Nick Mathewson
|
1a49fdecf8
Tweaks to Cagara's CountPrivateBandwidth patch:
|
15 lat temu |
 Daniel Cagara
|
e61f3293e4
Patch from cagara: Add a CountPrivateBandwidth flag
|
15 lat temu |
|
Nick Mathewson
|
3a9d0b4b9c
remove duplicate changes file for 2702
|
15 lat temu |
|
Nick Mathewson
|
3cf23be712
Merge branch 'static-work'
|
15 lat temu |
|
Nick Mathewson
|
ad1ae44154
Changes file for static-work branch
|
15 lat temu |
 Roger Dingledine
|
1587e0d470
Merge branch 'maint-0.2.2'
|
15 lat temu |
|
Roger Dingledine
|
9d2b3849b2
Merge branch 'maint-0.2.1' into maint-0.2.2
|
15 lat temu |
|
Roger Dingledine
|
0cdd262941
switch to the apr 2011 geoip db
|
15 lat temu |
 Sebastian Hahn
|
e97f78d789
Small fixes for the 2702 implementation
|
15 lat temu |
 Jacob Appelbaum
|
fe051a43c1
add --enable-static-tor to our configure script
|
15 lat temu |
|
Nick Mathewson
|
ee871e7a0e
Merge remote-tracking branch 'origin/maint-0.2.2'
|
15 lat temu |
|
Nick Mathewson
|
65eb0e41ac
Use cbt to tell when to launch parallel intro circuit
|
15 lat temu |
|
Nick Mathewson
|
aa950e6c48
Use timevals, not time_t, when expiring circuits.
|
15 lat temu |
|
Nick Mathewson
|
5eaba5ac21
Implement replacements for timer(add,cmp,sub) on platforms lacking them.
|
15 lat temu |
|
Nick Mathewson
|
22f7042b91
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
|
15 lat temu |
 Erinn Clark
|
3a7cee9d29
Fix configure.in zlib package names.
|
15 lat temu |
|
Nick Mathewson
|
18126f92a7
Merge remote-tracking branch 'origin/maint-0.2.2'
|
15 lat temu |
|
Sebastian Hahn
|
4762118832
Small tweaks for bug2698 bugfix
|
15 lat temu |
|
Jacob Appelbaum
|
b62abf9f21
Fix libevent autoconf bug #2698
|
15 lat temu |
|
Nick Mathewson
|
8b393afa94
Merge remote branch 'origin/maint-0.2.2'
|
15 lat temu |
|
Nick Mathewson
|
fe86be61b6
Fix signed/unsigned compare warning
|
15 lat temu |
|
Nick Mathewson
|
f3d6663665
Merge remote branch 'sebastian/bug2696' into maint-0.2.2
|
15 lat temu |
|
Sebastian Hahn
|
4aac35cafa
Add 2696 changes file
|
15 lat temu |
|
Sebastian Hahn
|
3f94c4a1cb
Remove superfluous -g -O2 compiler argument
|
15 lat temu |
|
Nick Mathewson
|
547635c004
Futz with the clang patch a bit and tidy some geoip.c stuff
|
15 lat temu |
