Nick Mathewson
|
a2a8adeee5
Merge remote branch 'origin/maint-0.2.2'
|
14 years ago |
Nick Mathewson
|
aa178aae03
Merge branch 'bug1863_bwhist' into maint-0.2.2
|
14 years ago |
Nick Mathewson
|
2eadbd41f0
Merge remote branch 'sebastian/bug2496'
|
14 years ago |
Nick Mathewson
|
46b07462ae
Merge remote branch 'origin/maint-0.2.2'
|
14 years ago |
Nick Mathewson
|
9d5873cdae
Merge branch 'log_domains' into maint-0.2.2
|
14 years ago |
George Kadianakis
|
ee95430d39
Implement more heartbeat message stuff.
|
15 years ago |
Sebastian Hahn
|
098b6ba72d
Initial heartbeat subsystem commit.
|
15 years ago |
Nick Mathewson
|
0ba69714b4
Merge remote branch 'sebastian/bug2444'
|
14 years ago |
Nick Mathewson
|
f1a004797e
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
Robert Ransom
|
449d895f06
Merge branch 'bug2408-v2-021-common' into bug2408-v2-022
|
14 years ago |
Robert Ransom
|
7bf06d4a4f
Ignore and warn about "PublishServerDescriptor hidserv"
|
14 years ago |
Nick Mathewson
|
cc9809c1f7
Merge remote branch 'origin/maint-0.2.2'
|
14 years ago |
Nick Mathewson
|
d43470ad8a
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
14 years ago |
Roger Dingledine
|
bcbcda309a
move the clause above the "if bw is too low" check
|
14 years ago |
Roger Dingledine
|
20b75989ac
dtrt when only relaybandwidthburst is set
|
14 years ago |
Nick Mathewson
|
ff5810aea9
Merge remote branch 'origin/maint-0.2.2'
|
14 years ago |
Sebastian Hahn
|
7736f44698
Don't tell Tor client users about missing geoip
|
14 years ago |
Sebastian Hahn
|
490d397dbf
Log which config file we read
|
14 years ago |
Nick Mathewson
|
d92a415bed
Add an option to disable the block-private-addresses feature
|
14 years ago |
Nick Mathewson
|
89ee779f92
Add a torrc option to report log domains
|
14 years ago |
Nick Mathewson
|
36880b3f17
Merge remote branch 'origin/maint-0.2.2'
|
14 years ago |
Sebastian Hahn
|
68f8ca357f
Fix assert for relay/bridge state change
|
14 years ago |
Nick Mathewson
|
1b8f2ef550
Merge remote branch 'origin/maint-0.2.2'
|
14 years ago |
Nick Mathewson
|
ed87738ede
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
14 years ago |
Nick Mathewson
|
115782bdbe
Fix a heap overflow found by debuger, and make it harder to make that mistake again
|
14 years ago |
Nick Mathewson
|
cbcae4aef1
Merge remote branch 'origin/maint-0.2.2'
|
15 years ago |
Nick Mathewson
|
5044cb9752
Explain bug2346 fix better based on suggestions from arma
|
15 years ago |
Nick Mathewson
|
95968a625e
Wait 60 minutes before retrying failed state save; bug2346
|
15 years ago |
Nick Mathewson
|
105b94b75b
Add Maxima lists to bandwidth state.
|
15 years ago |
Nick Mathewson
|
8730884ebe
Merge remote branch 'origin/maint-0.2.2'
|
15 years ago |