diff options
| author | Peter Palfrader <peter@palfrader.org> | 2006-01-12 02:19:40 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2006-01-12 02:19:40 +0000 |
| commit | b3b18aedad93dba397d2b55a2ecf6ffd419af206 (patch) | |
| tree | b11dcaa4e90e5d1e3d0a09776eb00b5d940936e4 | |
| parent | 6fcb7675e107f6b247554e5b39e7bfd75a3f93b2 (diff) | |
| download | tor-b3b18aedad93dba397d2b55a2ecf6ffd419af206.tar.gz tor-b3b18aedad93dba397d2b55a2ecf6ffd419af206.zip | |
Forward port patches/02_add_debian_files_in_manpage and patches/03_tor_manpage_in_section_8.
svn:r5822
| -rw-r--r-- | changelog | 10 | ||||
| -rwxr-xr-x | patches/02_add_debian_files_in_manpage.dpatch | 18 | ||||
| -rwxr-xr-x | patches/03_tor_manpage_in_section_8.dpatch | 4 |
3 files changed, 22 insertions, 10 deletions
@@ -1,3 +1,11 @@ +tor (0.1.1.12-alpha-2XXXXXX) unreleased; urgency=low + + * CVS SNAPSHOT + * Forward port patches/02_add_debian_files_in_manpage. + * Forward port patches/03_tor_manpage_in_section_8. + + -- Peter Palfrader <weasel@debian.org> Thu, 12 Jan 2006 03:18:59 +0100 + tor (0.1.1.12-alpha-1) experimental; urgency=low * New upstream version, that was a quick one. :) @@ -8,7 +16,7 @@ tor (0.1.1.12-alpha-1) experimental; urgency=low tor (0.1.1.11-alpha-1) experimental; urgency=low * New upstream version. - * forward port patches/07_log_to_file_by_default. + * Forward port patches/07_log_to_file_by_default. * Forward port 0.1.0.16 changelog and change to copyright file. -- Peter Palfrader <weasel@debian.org> Wed, 11 Jan 2006 12:08:25 +0100 diff --git a/patches/02_add_debian_files_in_manpage.dpatch b/patches/02_add_debian_files_in_manpage.dpatch index 277a2fb584..69f8c8a535 100755 --- a/patches/02_add_debian_files_in_manpage.dpatch +++ b/patches/02_add_debian_files_in_manpage.dpatch @@ -26,16 +26,20 @@ exit 0 diff -urNad tor-0.1.1.5/doc/tor.1.in /tmp/dpep.E9VjWB/tor-0.1.1.5/doc/tor.1.in --- tor-0.1.1.12/doc/tor.1.in +++ /tmp/dpep.E9VjWB/tor-0.1.1.12/doc/tor.1.in -@@ -710,6 +710,12 @@ - (fingerprint) are rejected by the authoritative directory server. If - it is \fB!invalid\fP then descriptors are accepted but marked in the - directory as not valid (not recommended). +@@ -700,9 +700,15 @@ + .TP + .B @LOCALSTATEDIR@/lib/tor/ + The tor process stores keys and other data here. +.TP +.B /var/log/tor/ +The tor server logs to this directory. +.TP +.B /var/run/tor/tor.pid +The PID of the tor (master) process is stored in this file. - .SH SEE ALSO - .BR privoxy (1), - .BR tsocks (1), + .LP + .TP +-.B \fIDataDirectory\fP/approved-routers ++.B /var/lib/tor/approved-routers + Only for naming authoritative directory servers + (see \fBNamingAuthoritativeDirectory\fP). + This file lists nickname to identity bindings. Each line lists a diff --git a/patches/03_tor_manpage_in_section_8.dpatch b/patches/03_tor_manpage_in_section_8.dpatch index 75e342c189..fe8a399968 100755 --- a/patches/03_tor_manpage_in_section_8.dpatch +++ b/patches/03_tor_manpage_in_section_8.dpatch @@ -38,8 +38,8 @@ 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 @@ -1,4 +1,4 @@ --.TH TOR 1 "September 2005" "TOR" -+.TH TOR 8 "September 2005" "TOR" +-.TH TOR 1 "January 2006" "TOR" ++.TH TOR 8 "January 2006" "TOR" .SH NAME tor \- The second-generation onion router .SH SYNOPSIS |