]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'rransom-tor/bug3335-v2'
authorNick Mathewson <nickm@torproject.org>
Mon, 3 Oct 2011 19:06:07 +0000 (15:06 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 3 Oct 2011 19:06:07 +0000 (15:06 -0400)
commit4aa4bce474e6fb3e52c0aecb48f3e5024576e693
treee50f755df4f2f7ee1fed7d11f0671abf46899e06
parenta7f93b509c9c24a4af6abdd946007bdf2d497d87
parentc5226bfe1c26d2cbcc789c1074d8d925e7c7fea1
Merge remote-tracking branch 'rransom-tor/bug3335-v2'

Conflicts:
src/or/connection_edge.c
src/or/rendclient.c
src/or/circuitlist.c
src/or/circuituse.c
src/or/connection_edge.c
src/or/or.h
src/or/rendclient.c
src/or/rendclient.h