 Nick Mathewson
|
47f472510f
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
bb6d45af1f
Downgrade notice to info when downloading a cert.
|
14 years ago |
 Roger Dingledine
|
9d673dcd20
fix some comments before they create conflicts
|
14 years ago |
|
Nick Mathewson
|
6a726d34e1
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
1cff525973
Fix compilation in last patch
|
14 years ago |
|
Nick Mathewson
|
f083347adf
Merge remote-tracking branch 'sebastian/bug2704' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
075d904d39
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
 Sebastian Hahn
|
6fde2b46d2
Fix more of bug 2704
|
14 years ago |
|
Sebastian Hahn
|
4c789ec08c
Don't leak the local hostname in relay nicknames
|
14 years ago |
|
Nick Mathewson
|
5230cc4fe7
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
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
|
fdbdaf8fab
Merge remote-tracking branch 'origin/maint-0.2.2'
|
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 |
|
Nick Mathewson
|
7c83d4043d
Merge remote-tracking branch 'origin/maint-0.2.2'
|
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
|
4a7f979b54
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
5cc322e547
Standardize our printf code on %d, not %i.
|
14 years ago |
|
Nick Mathewson
|
9eeb902d12
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
177cadff8d
Merge remote-tracking branch 'rransom/bug2948' into maint-0.2.2
|
14 years ago |
|
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 |
|
Nick Mathewson
|
48bdc2f729
Correct HS descriptor length check
|
14 years ago |
