summaryrefslogtreecommitdiff
path: root/changes/bug3465-023
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-07-20 09:50:53 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-20 09:50:53 -0400
commiteaa1c05397c1a6cf2f58b7c41e388311d5aa8ffb (patch)
treeb304aaca9b8d5364517d4ab23ffd232cf420858d /changes/bug3465-023
parent195bcb6150eeaebab31a44998e2c567d78f9b936 (diff)
parent9a7c16fb00c6ffc32ef7d6cc7fbede5258fe4390 (diff)
downloadtor-eaa1c05397c1a6cf2f58b7c41e388311d5aa8ffb.tar.gz
tor-eaa1c05397c1a6cf2f58b7c41e388311d5aa8ffb.zip
Merge branch 'optimistic-client'
The conflicts are with the proposal 171 circuit isolation code, and they're all trivial: they're just a matter of both branches adding some unrelated code in the same places. Conflicts: src/or/circuituse.c src/or/connection.c
Diffstat (limited to 'changes/bug3465-023')
0 files changed, 0 insertions, 0 deletions