 Nick Mathewson
|
f3b58dfa53
Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2
|
14 years ago |
 Sebastian Hahn
|
91aa6f08bc
Make the Log configuration option expand ~
|
14 years ago |
|
Nick Mathewson
|
a0514ba531
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
e98583594d
Fix a bug in removing DNSPort requests from their circular list
|
14 years ago |
|
Sebastian Hahn
|
3f7f96d9e7
Prevent hugely inflated observed bandwidth values
|
14 years ago |
|
Sebastian Hahn
|
13c3884ff6
Don't sometimes undercount bw average
|
14 years ago |
|
Nick Mathewson
|
5cc322e547
Standardize our printf code on %d, not %i.
|
14 years ago |
|
Nick Mathewson
|
177cadff8d
Merge remote-tracking branch 'rransom/bug2948' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
0e554f93d6
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
dfc9c6a0f9
Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1
|
14 years ago |
|
Nick Mathewson
|
bc532bb13f
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
cfd7b118a7
Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only)
|
14 years ago |
|
Nick Mathewson
|
48bdc2f729
Correct HS descriptor length check
|
14 years ago |
 Robert Ransom
|
130db1bdeb
Merge branch 'bug2750-v3' into bug2948
|
14 years ago |
|
Robert Ransom
|
adc31001c2
Add an XXX
|
14 years ago |
|
Robert Ransom
|
bfebc942ea
Correct the warning emitted when rejecting an oversized HS desc
|
14 years ago |
|
Sebastian Hahn
|
4cbbb92e7f
Add a changes file for the osx 10.6 compile fix
|
14 years ago |
|
Nick Mathewson
|
e247705afe
Merge branch 'bug2373' into maint-0.2.2
|
14 years ago |
 Gisle Vanem
|
70e0291468
Use GetTempDir instead of hardcoded path to c:\windows\tmp for unittests
|
14 years ago |
|
Nick Mathewson
|
1be1221385
Free pending_cb_messages on exit
|
14 years ago |
|
Nick Mathewson
|
403b6cfded
Free circuits_for_buffer_stats on shutdown
|
14 years ago |
|
Nick Mathewson
|
71fb2af62c
Fix up some cell-queue stats issues in rephist.c
|
14 years ago |
|
Nick Mathewson
|
ba0cd8094f
Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
118d8ffdcb
Allow controllers a more up-to-date view of bridge usage.
|
14 years ago |
|
Sebastian Hahn
|
286d44402e
Fix a compile warning on OS X 10.6
|
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 |
 Roger Dingledine
|
9d2b3849b2
Merge branch 'maint-0.2.1' into maint-0.2.2
|
14 years ago |
|
Roger Dingledine
|
0cdd262941
switch to the apr 2011 geoip db
|
14 years ago |
|
Nick Mathewson
|
65eb0e41ac
Use cbt to tell when to launch parallel intro circuit
|
14 years ago |
