]> git.ipfire.org Git - thirdparty/tor.git/commit
projects / thirdparty / tor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8aad677 569fe93)
Merge remote-tracking branch 'public/split_entry_conn'
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Sep 2011 18:13:57 +0000 (14:13 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Sep 2011 18:13:57 +0000 (14:13 -0400)
commit0cb01f5c971e497706b209c3fe75aedd089e3c8a
treece8a48e2255289d2c513dd1b7b8336f56dc9a37etree | snapshot
parent8aad677bb7542376b053ecd12a0c6943e8cfa3c0commit | diff
parent569fe936b8349082d6f9dcd4e55f7d5758d236becommit | diff
Merge remote-tracking branch 'public/split_entry_conn'

Conflicts:
src/or/connection.c
src/or/connection_edge.c
src/or/connection_edge.h
src/or/dnsserv.c

Some of these were a little tricky, since they touched code that
changed because of the prop171 fixes.
src/or/connection.c diff1 | diff2 | blob | history
src/or/connection_edge.c diff1 | diff2 | blob | history
src/or/connection_edge.h diff1 | diff2 | blob | history
src/or/control.c diff1 | diff2 | blob | history
src/or/control.h diff1 | diff2 | blob | history
src/or/directory.c diff1 | diff2 | blob | history
src/or/dnsserv.c diff1 | diff2 | blob | history
src/or/main.c diff1 | diff2 | blob | history
src/or/or.h diff1 | diff2 | blob | history
Mirror of https://git.torproject.org/tor.git