]> git.ipfire.org Git - thirdparty/tor.git/commit
projects / thirdparty / tor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b36d4c e6d1ab3)
Merge branch 'bug7011'
authorNick Mathewson <nickm@torproject.org>
Thu, 11 Oct 2012 02:31:06 +0000 (22:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Oct 2012 02:31:06 +0000 (22:31 -0400)
commit7ea904cbc0acbe1575ff68700572da76e4e4b10d
treee893c6fd57794cc9b9cacdb414292edd2aa8cb16tree | snapshot
parent8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9commit | diff
parente6d1ab3600c6bbbda7f30093fb7623581a44a325commit | diff
Merge branch 'bug7011'

Conflicts:
src/or/circuitbuild.c

The conflict was trivial, since no line of code actually changed in
both branches: There was a fmt_addr() that turned into fmt_addrport()
in bug7011, and a "if (!n_conn)" that turned into "if (!n_chan)" in
master.
src/or/circuitbuild.c diff1 | diff2 | blob | history
src/or/config.c diff1 | diff2 | blob | history
src/or/connection.c diff1 | diff2 | blob | history
src/or/connection_edge.c diff1 | diff2 | blob | history
src/or/connection_or.c diff1 | diff2 | blob | history
src/or/dirserv.c diff1 | diff2 | blob | history
Mirror of https://git.torproject.org/tor.git