summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2009-01-21 00:01:07 +0000
committerPeter Palfrader <peter@palfrader.org>2009-01-21 00:01:07 +0000
commitdf5a94fc67427efeccca5123bf03fc71c1dfb529 (patch)
tree0a3494218f8b57155bbec55c4b498373db6e0d59 /debian
parent8304026b1ab4e040bf52fcd6cdc72fc1c2bf7ca1 (diff)
downloadtor-df5a94fc67427efeccca5123bf03fc71c1dfb529.tar.gz
tor-df5a94fc67427efeccca5123bf03fc71c1dfb529.zip
And forward port patches
svn:r18195
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/patches/03_tor_manpage_in_section_8.dpatch2
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index e541096614..7433f7cc6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ tor (0.2.1.11-alpha-1) experimental; urgency=high
- torify(1) manpage mentions DNS leaks now (closes: #495829).
* README.Debian: No longer claim we change the default 'Group' setting
when run as debian-user. That setting no longer exists.
+ * Forward port 03_tor_manpage_in_section_8.dpatch.
- -- Peter Palfrader <weasel@debian.org> Wed, 21 Jan 2009 00:55:19 +0100
+ -- Peter Palfrader <weasel@debian.org> Wed, 21 Jan 2009 01:00:15 +0100
tor (0.2.1.10-alpha-1) experimental; urgency=low
diff --git a/debian/patches/03_tor_manpage_in_section_8.dpatch b/debian/patches/03_tor_manpage_in_section_8.dpatch
index 1c498d7f5f..28bbf957c0 100755
--- a/debian/patches/03_tor_manpage_in_section_8.dpatch
+++ b/debian/patches/03_tor_manpage_in_section_8.dpatch
@@ -32,8 +32,8 @@ diff -urNad tor-0.1.1.5/contrib/torify.1 /tmp/dpep.fOA3Mm/tor-0.1.1.5/contrib/to
.SH SEE ALSO
-.BR tor (1),
+.BR tor (8),
+ .BR tor-resolve (1),
.BR tsocks (1),
- .BR tsocks.conf (5).
diff -urNad tor-0.1.1.5/doc/tor.1.in /tmp/dpep.fOA3Mm/tor-0.1.1.5/doc/tor.1.in
--- tor-0.1.1.5/doc/tor.1.in
+++ /tmp/dpep.fOA3Mm/tor-0.1.1.5/doc/tor.1.in