]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b2b8ef 0165f27)
Merge branch 'debian-merge' into debian
authorPeter Palfrader <peter@palfrader.org>
Sun, 15 Nov 2009 09:37:48 +0000 (10:37 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 15 Nov 2009 09:37:48 +0000 (10:37 +0100)
* debian-merge:
  New upstream version
  fix compile on windows
  bump to 0.2.2.5-alpha
  Move dizum to an alternate IP address.
  Ship test.h in release


Trivial merge
Mirror of https://git.torproject.org/tor.git