]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc5b6d6 850d8c9)
Merge branch 'bug1983-port-tor-fw-helper-to-windows' into bug2046
authorSteven Murdoch <Steven.Murdoch@cl.cam.ac.uk>
Mon, 22 Aug 2011 16:53:17 +0000 (17:53 +0100)
committerSteven Murdoch <Steven.Murdoch@cl.cam.ac.uk>
Mon, 22 Aug 2011 16:53:17 +0000 (17:53 +0100)
Conflicts:
configure.in
src/tools/tor-fw-helper/Makefile.am
src/tools/tor-fw-helper/tor-fw-helper-upnp.c
src/tools/tor-fw-helper/tor-fw-helper.c

1  2 
configure.in patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
Mirror of https://git.torproject.org/tor.git