 Sebastian Hahn
|
4b13ebd5ab
Merge branch 'bug3k_021' into bug3k_022
|
13 years ago |
|
Sebastian Hahn
|
8a36f21251
Fix a failure case of connection_ap_handshake_attach_circuit()
|
13 years ago |
 Robert Ransom
|
2ad18ae736
Allow rend_client_send_introduction to fail transiently
|
13 years ago |
 Roger Dingledine
|
d4a61c76a1
Merge branch 'maint-0.2.2'
|
13 years ago |
|
Roger Dingledine
|
cba1d29b7f
make make check-spaces happier.
|
13 years ago |
 Nick Mathewson
|
8b686d98c4
Merge maint-0.2.2 for the bug1090-part1-squashed branch
|
13 years ago |
|
Roger Dingledine
|
f7a5bc16d6
warn if we launch too many circuits for a given stream
|
13 years ago |
|
Roger Dingledine
|
f962dda8c1
revert most of ef81649d2fc
|
13 years ago |
|
Nick Mathewson
|
8ee92f28e0
Add a circuit_purpose_to_string() function, and use it
|
13 years ago |
|
Roger Dingledine
|
7e2e8074d5
slight tweak on circuit_conforms_to_options
|
13 years ago |
|
Nick Mathewson
|
67d88a7d60
Merge remote-tracking branch 'origin/maint-0.2.2'
|
13 years ago |
|
Nick Mathewson
|
ba0cd8094f
Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2
|
13 years ago |
|
Nick Mathewson
|
09759a66ea
Merge remote-tracking branch 'origin/maint-0.2.2'
|
13 years ago |
|
Sebastian Hahn
|
286d44402e
Fix a compile warning on OS X 10.6
|
13 years ago |
|
Nick Mathewson
|
ee871e7a0e
Merge remote-tracking branch 'origin/maint-0.2.2'
|
13 years ago |
|
Nick Mathewson
|
65eb0e41ac
Use cbt to tell when to launch parallel intro circuit
|
13 years ago |
|
Nick Mathewson
|
aa950e6c48
Use timevals, not time_t, when expiring circuits.
|
13 years ago |
|
Nick Mathewson
|
05887f10ff
Triage the XXX022 and XXX021 comments remaining in the code
|
13 years ago |
|
Nick Mathewson
|
8730884ebe
Merge remote branch 'origin/maint-0.2.2'
|
13 years ago |
|
Nick Mathewson
|
f1de329e78
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
13 years ago |
|
Nick Mathewson
|
1a07348a50
Bump copyright statements to 2011
|
13 years ago |
|
Nick Mathewson
|
36c5476e70
Fold timestamp_created into highres_created
|
13 years ago |
|
Nick Mathewson
|
4080d9b0fa
Fix a couple more node_t-related nullpointer bugs
|
13 years ago |
|
Nick Mathewson
|
26e897420e
Initial conversion to use node_t throughout our codebase.
|
13 years ago |
|
Nick Mathewson
|
d84d20cbb2
Try to make most routerinfo_t interfaces const
|
13 years ago |
|
Roger Dingledine
|
3cbe463e96
Merge branch 'bug1772' into maint-0.2.2
|
13 years ago |
|
Roger Dingledine
|
ceb3d4d578
no measurement circs if not enough build times
|
13 years ago |
|
Roger Dingledine
|
7f10707c42
refactor and recomment; no actual changes
|
13 years ago |
|
Roger Dingledine
|
48cd096276
Merge commit 'mikeperry/bug1739' into maint-0.2.2
|
13 years ago |
|
Roger Dingledine
|
474e4d2722
Merge commit 'mikeperry/bug1740' into maint-0.2.2
|
13 years ago |
