 Nick Mathewson
|
f52cfbfc00
Merge remote-tracking branch 'origin/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
|
bba47a836c
Merge remote-tracking branch 'origin/maint-0.2.2'
|
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
|
750b5119c0
Merge remote-tracking branch 'asn/heartbeat'
|
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 |
 George Kadianakis
|
c2d9d80a07
Reuse get_bytes_{read,written}() in status.c
|
14 years ago |
 Roger Dingledine
|
c4bf7f59d8
forward-port the 0.2.2.24-alpha changelog
|
14 years ago |
 Sebastian Hahn
|
4cbbb92e7f
Add a changes file for the osx 10.6 compile fix
|
14 years ago |
|
Nick Mathewson
|
99c2bfe76b
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
e247705afe
Merge branch 'bug2373' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
85ac832a14
Merge remote-tracking branch 'origin/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
|
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.
|
14 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 |
