 Nick Mathewson
|
d35a555348
Merge branch 'bug3289' into maint-0.2.2
|
13 years ago |
 Sebastian Hahn
|
ca538290af
Warn when two hs use the same directory
|
13 years ago |
|
Nick Mathewson
|
fa1d47293b
Merge remote-tracking branch 'origin/maint-0.2.2'
|
13 years ago |
 Roger Dingledine
|
f118dc80e0
minor cleanups while reviewing 3216
|
13 years ago |
|
Nick Mathewson
|
7f0fb8e608
whitespace fixes
|
13 years ago |
|
Nick Mathewson
|
7e67a24038
Merge branch 'bug3045' into maint-0.2.2
|
13 years ago |
|
Nick Mathewson
|
3c0d944b07
Improve comments and defensive programming for 3045
|
13 years ago |
|
Nick Mathewson
|
21de9d46e2
Merge remote-tracking branch 'origin/maint-0.2.2'
|
13 years ago |
|
Nick Mathewson
|
da7c60dcf3
Merge remote-tracking branch 'public/bug3270' into maint-0.2.2
|
13 years ago |
|
Nick Mathewson
|
5dc3c462dc
Merge remote-tracking branch 'origin/maint-0.2.2'
|
13 years ago |
|
Nick Mathewson
|
6802499413
Merge branch 'bug3228_squashed' into maint-0.2.2
|
13 years ago |
|
Nick Mathewson
|
f08f0e9dde
Reinit keys at the start of options_act().
|
13 years ago |
|
Nick Mathewson
|
4b57ec6e5e
Merge remote-tracking branch 'origin/maint-0.2.2'
|
13 years ago |
|
Nick Mathewson
|
16cfca501f
Merge branch 'bug1297a' into maint-0.2.2
|
13 years ago |
 Robert Ransom
|
8fc02a8e0c
Use the normal four-hop CBT for client intro circuits
|
13 years ago |
|
Robert Ransom
|
112d204fad
Set timestamp_dirty on HS circuits as circuit_expire_building requires
|
13 years ago |
|
Roger Dingledine
|
6917728637
Merge branch 'maint-0.2.2'
|
13 years ago |
|
Roger Dingledine
|
5f182ea10e
answer an XXX nickm asked in aa950e6c4
|
13 years ago |
|
Nick Mathewson
|
e676db656d
Merge remote-tracking branch 'origin/maint-0.2.2'
|
13 years ago |
|
Nick Mathewson
|
1f18b5a5d5
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
|
13 years ago |
|
Nick Mathewson
|
f43aceb0f1
Fix typo in changes/bug2574. Thanks, rransom
|
13 years ago |
|
Nick Mathewson
|
285cf998bc
Merge remote-tracking branch 'origin/maint-0.2.2'
|
13 years ago |
|
Nick Mathewson
|
c319949550
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
|
13 years ago |
|
Nick Mathewson
|
ee72557d52
Merge branch 'bug2574' into maint-0.2.1
|
13 years ago |
|
Nick Mathewson
|
8e09f7cf10
Fix a -Wunused-but-set-variable instance in master
|
13 years ago |
|
Nick Mathewson
|
42b15a0aaa
Merge remote-tracking branch 'origin/maint-0.2.2'
|
13 years ago |
|
Nick Mathewson
|
0e1fad648d
Don't try to build descriptors when router_get_advertised_or_port()==0
|
13 years ago |
|
Nick Mathewson
|
95ac3ea594
Don't build descriptors if ORPort auto is set and we have no OR listener
|
13 years ago |
|
Nick Mathewson
|
be76850995
Work correctly if your nameserver is ::1
|
13 years ago |
|
Nick Mathewson
|
a5232e0c4c
Fix GCC 4.6's new -Wunused-but-set-variable warnings.
|
13 years ago |
