]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cafd868 e7d2a9b)
Merge commit 'origin/maint-0.2.1'
authorNick Mathewson <nickm@torproject.org>
Wed, 4 Aug 2010 16:37:30 +0000 (12:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 4 Aug 2010 16:37:30 +0000 (12:37 -0400)
Conflicts:
debian/changelog
debian/control
debian/patches/03_tor_manpage_in_section_8.dpatch
debian/patches/06_add_compile_time_defaults.dpatch
debian/rules


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