diff --git a/debian/changelog b/debian/changelog index ae8b773f2b791dedb85ee9fd852f85e64eb3dd76..65743049d358256a4342e6fd5f3d0131cb456b83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ tor (0.2.2.21-alpha-1) experimental; urgency=high * New upstream version, including several security related fixes. See upstream changelog for details. Addresses CVE-2011-0427. + * Forward port patches/03_tor_manpage_in_section_8. - -- Peter Palfrader <weasel@debian.org> Sun, 16 Jan 2011 18:18:53 +0100 + -- Peter Palfrader <weasel@debian.org> Sun, 16 Jan 2011 18:40:27 +0100 tor (0.2.2.20-alpha-1) experimental; urgency=high diff --git a/debian/patches/03_tor_manpage_in_section_8.dpatch b/debian/patches/03_tor_manpage_in_section_8.dpatch index 8570905d6eebb352c0c31d6b5b3b3d229cdde24d..10bece61efe5e3c9526c05e94a10cb9da03feb9f 100755 --- a/debian/patches/03_tor_manpage_in_section_8.dpatch +++ b/debian/patches/03_tor_manpage_in_section_8.dpatch @@ -50,7 +50,6 @@ diff -ur tor-0.2.2.9-alpha/doc/tor-resolve.1.txt tor-0.2.2.9-alpha.new/doc/tor-r AUTHORS ------- -Roger Dingledine <arma@mit.edu>, Nick Mathewson <nickm@alum.mit.edu>. -\ No newline at end of file +Roger Dingledine <arma@mit.edu>, Nick Mathewson <nickm@alum.mit.edu>. diff -ur tor-0.2.2.9-alpha/doc/tor.1.txt tor-0.2.2.9-alpha.new/doc/tor.1.txt --- tor-0.2.2.9-alpha/doc/tor.1.txt 2010-02-22 22:22:33.000000000 +0100