]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commitde7ed2fd7a094de440bc00867a5afa8e0dde7936
tree31126ce80881808b379f203f863286dd0a755649
parentcafd868a7898a0aac7eaf58f76a8e1180766d3a8
parente7d2a9b6c4407217780be3a0d0cbb29fd3812cf5
Merge commit 'origin/maint-0.2.1'

Conflicts:
debian/changelog
debian/control
debian/patches/03_tor_manpage_in_section_8.dpatch
debian/patches/06_add_compile_time_defaults.dpatch
debian/rules