[or-cvs] r18195: {tor} And forward port patches (in tor/trunk/debian: . patches)

[weasel at seul.org]

Author: weasel
Date: 2009-01-20 19:01:07 -0500 (Tue, 20 Jan 2009)
New Revision: 18195

Modified:
   tor/trunk/debian/changelog
   tor/trunk/debian/patches/03_tor_manpage_in_section_8.dpatch
Log:
And forward port patches

Modified: tor/trunk/debian/changelog
===================================================================
--- tor/trunk/debian/changelog	2009-01-20 23:56:20 UTC (rev 18194)
+++ tor/trunk/debian/changelog	2009-01-21 00:01:07 UTC (rev 18195)
@@ -5,8 +5,9 @@
     - 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 at debian.org>  Wed, 21 Jan 2009 00:55:19 +0100
+ -- Peter Palfrader <weasel at debian.org>  Wed, 21 Jan 2009 01:00:15 +0100
 
 tor (0.2.1.10-alpha-1) experimental; urgency=low
 

Modified: tor/trunk/debian/patches/03_tor_manpage_in_section_8.dpatch
===================================================================
--- tor/trunk/debian/patches/03_tor_manpage_in_section_8.dpatch	2009-01-20 23:56:20 UTC (rev 18194)
+++ tor/trunk/debian/patches/03_tor_manpage_in_section_8.dpatch	2009-01-21 00:01:07 UTC (rev 18195)
@@ -32,8 +32,8 @@
  .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