April 2014 - tor-commits - lists.torproject.org

[ooni-probe/master] Merge pull request #308 from TheTorProject/fix/issue_c
by art＠torproject.org 30 Apr '14

30 Apr '14

commit 159b0c3fa83692a9882c94c5476f30fc9c0462ab Merge: 858f09d 68cac6e Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Wed Apr 30 19:00:53 2014 +0200 Merge pull request #308 from TheTorProject/fix/issue_c Escape strings before writing them to the log. ooni/tests/test_utils.py | 12 ++++++++++- ooni/utils/log.py | 52 +++++++++++++++++++++++++++++++++++++--------- 2 files changed, 53 insertions(+), 11 deletions(-)

1 0

[ooni-probe/master] Escape strings before writing them to the log.
by art＠torproject.org 30 Apr '14

30 Apr '14

commit 68cac6eabf474dd32f317e1671f3e9dc2b5fd697 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Apr 23 16:25:49 2014 +0200 Escape strings before writing them to the log. This fixes: https://github.com/TheTorProject/ooni-probe/issues/302 for ooni-probe --- ooni/tests/test_utils.py | 12 ++++++++++- ooni/utils/log.py | 52 +++++++++++++++++++++++++++++++++++++--------- 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/ooni/tests/test_utils.py b/ooni/tests/test_utils.py index 10aa0cc..e21ab89 100644 --- a/ooni/tests/test_utils.py +++ b/ooni/tests/test_utils.py @@ -1,7 +1,9 @@ import os from twisted.trial import unittest -from ooni.utils import pushFilenameStack +from ooni.utils import pushFilenameStack, log + + class TestUtils(unittest.TestCase): def test_pushFilenameStack(self): basefilename = os.path.join(os.getcwd(), 'dummyfile') @@ -20,3 +22,11 @@ class TestUtils(unittest.TestCase): self.assertEqual(str(i-1), str(c)) f.close() + def test_log_encode(self): + logmsgs = ( + (r"spam\x07\x08", "spam\a\b"), + (r"spam\x07\x08", u"spam\a\b"), + (r"ham\u237e", u"ham"+u"\u237e") + ) + for encoded_logmsg, logmsg in logmsgs: + self.assertEqual(log.log_encode(logmsg), encoded_logmsg) diff --git a/ooni/utils/log.py b/ooni/utils/log.py index 7fafcfb..beba78f 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -1,5 +1,6 @@ -import sys import os +import sys +import codecs import logging import traceback @@ -10,10 +11,33 @@ from twisted.python.logfile import DailyLogFile from ooni import otime -## Get rid of the annoying "No route found for -## IPv6 destination warnings": +# Get rid of the annoying "No route found for +# IPv6 destination warnings": logging.getLogger("scapy.runtime").setLevel(logging.ERROR) + +def log_encode(logmsg): + """ + I encode logmsg (a str or unicode) as printable ASCII. Each case + gets a distinct prefix, so that people differentiate a unicode + from a utf-8-encoded-byte-string or binary gunk that would + otherwise result in the same final output. + """ + if isinstance(logmsg, unicode): + return codecs.encode(logmsg, 'unicode_escape') + elif isinstance(logmsg, str): + try: + unicodelogmsg = logmsg.decode('utf-8') + except UnicodeDecodeError: + return codecs.encode(logmsg, 'string_escape') + else: + return codecs.encode(unicodelogmsg, 'unicode_escape') + else: + raise Exception("I accept only a unicode object or a string, " + "not a %s object like %r" % (type(logmsg), + repr(logmsg))) + + class LogWithNoPrefix(txlog.FileLogObserver): def emit(self, eventDict): text = txlog.textFromEventDict(eventDict) @@ -23,6 +47,7 @@ class LogWithNoPrefix(txlog.FileLogObserver): util.untilConcludes(self.write, "%s\n" % text) util.untilConcludes(self.flush) # Hoorj! + class OONILogger(object): def start(self, logfile=None, application_name="ooniprobe"): from ooni.settings import config @@ -30,16 +55,17 @@ class OONILogger(object): daily_logfile = None if not logfile: - logfile = config.basic.logfile + logfile = os.path.expanduser(config.basic.logfile) log_folder = os.path.dirname(logfile) log_filename = os.path.basename(logfile) daily_logfile = DailyLogFile(log_filename, log_folder) - txlog.msg("Starting %s on %s (%s UTC)" % (application_name, otime.prettyDateNow(), - otime.utcPrettyDateNow())) - + txlog.msg("Starting %s on %s (%s UTC)" % (application_name, + otime.prettyDateNow(), + otime.utcPrettyDateNow())) + self.fileObserver = txlog.FileLogObserver(daily_logfile) self.stdoutObserver = LogWithNoPrefix(sys.stdout) @@ -52,28 +78,34 @@ class OONILogger(object): oonilogger = OONILogger() + def start(logfile=None, application_name="ooniprobe"): oonilogger.start(logfile, application_name) + def stop(): oonilogger.stop() + def msg(msg, *arg, **kw): from ooni.settings import config if config.logging: - print "%s" % msg + print "%s" % log_encode(msg) + def debug(msg, *arg, **kw): from ooni.settings import config if config.advanced.debug and config.logging: - print "[D] %s" % msg + print "[D] %s" % log_encode(msg) + def err(msg, *arg, **kw): from ooni.settings import config if config.logging: if isinstance(msg, Exception): msg = "%s: %s" % (msg.__class__.__name__, msg) - print "[!] %s" % msg + print "[!] %s" % log_encode(msg) + def exception(error): """

1 0

[ooni-probe/master] Don't set requirements attribute since it's now used for another purpose.
by art＠torproject.org 30 Apr '14

30 Apr '14

commit 2822871edf77e97739d306cdac5031e59777160b Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Apr 30 18:32:34 2014 +0200 Don't set requirements attribute since it's now used for another purpose. --- ooni/nettests/blocking/dns_consistency.py | 3 +-- ooni/oonicli.py | 12 ++++++------ ooni/tests/test_oonicli.py | 18 ++++++++++++------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ooni/nettests/blocking/dns_consistency.py b/ooni/nettests/blocking/dns_consistency.py index 5d17741..9c9a5df 100644 --- a/ooni/nettests/blocking/dns_consistency.py +++ b/ooni/nettests/blocking/dns_consistency.py @@ -40,11 +40,10 @@ class DNSConsistencyTest(dnst.DNSTest): description = "Checks to see if the DNS responses from a set of DNS resolvers are consistent." version = "0.6" authors = "Arturo Filastò, Isis Lovecruft" - requirements = None inputFile = ['file', 'f', None, 'Input file of list of hostnames to attempt to resolve'] - + requiredTestHelpers = {'backend': 'dns'} requiresRoot = False requiresTor = False diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 98c3ee6..3993b38 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -106,16 +106,16 @@ def runWithDirector(logging=True, start_tor=True): config.advanced.debug = True if not start_tor: config.advanced.start_tor = False - + if logging: log.start(global_options['logfile']) - + if config.privacy.includepcap: try: checkForRoot() except errors.InsufficientPrivileges: log.err("Insufficient Privileges to capture packets." - " See ooniprobe.conf privacy.includepcap") + " See ooniprobe.conf privacy.includepcap") sys.exit(2) director = Director() @@ -123,12 +123,12 @@ def runWithDirector(logging=True, start_tor=True): print "# Installed nettests" for net_test_id, net_test in director.getNetTests().items(): print "* %s (%s/%s)" % (net_test['name'], - net_test['category'], + net_test['category'], net_test['id']) print " %s" % net_test['description'] sys.exit(0) - + elif global_options['printdeck']: del global_options['printdeck'] print "# Copy and paste the lines below into a test deck to run the specified test with the specified arguments" @@ -222,7 +222,7 @@ def runWithDirector(logging=True, start_tor=True): if config.advanced.debug: log.exception(failure) - + # Wait until director has started up (including bootstrapping Tor) # before adding tests def post_director_start(_): diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index edd17c6..cf6a340 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -34,11 +34,17 @@ class TestRunDirector(unittest.TestCase): f.write('http://torproject.org/\n') f.write('http://bridges.torproject.org/\n') f.write('http://blog.torproject.org/\n') - + def tearDown(self): - os.remove('test_report.yaml') - os.remove('example-input.txt') - + try: + os.remove('test_report.yaml') + except: + pass + try: + os.remove('example-input.txt') + except: + pass + @defer.inlineCallbacks def run_test(self, test_name, args, verify_function): output_file = 'test_report.yaml' @@ -91,8 +97,8 @@ class TestRunDirector(unittest.TestCase): assert 'control_resolver' in entry assert 'tampering' in entry assert len(entry['tampering']) == 1 - yield self.run_test('blocking/dns_consistency', - ['-b', '8.8.8.8:53', + yield self.run_test('blocking/dns_consistency', + ['-b', '8.8.8.8:53', '-t', '8.8.8.8', '-f', 'example-input.txt'], verify_function)

1 0

[ooni-probe/master] Merge pull request #314 from TheTorProject/fix/debian/743108
by art＠torproject.org 30 Apr '14

30 Apr '14

commit e6518fd3494f1926d4bb1887edd1810c3aedf09c Merge: 159b0c3 b615c85 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Wed Apr 30 19:26:46 2014 +0200 Merge pull request #314 from TheTorProject/fix/debian/743108 When running unittests don't write to outside the build dir. ooni/oonicli.py | 3 ++- ooni/settings.py | 18 ++++++++++++------ ooni/tests/__init__.py | 2 ++ ooni/tests/test_geoip.py | 11 ++++++++--- ooni/tests/test_nettest.py | 4 ++-- 5 files changed, 26 insertions(+), 12 deletions(-)

1 0

[ooni-probe/master] When running unittests don't write to outside the build dir.
by art＠torproject.org 30 Apr '14

30 Apr '14

commit b615c85392ad4ee433a3681758eccd6c95a3ee7e Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Apr 29 18:17:27 2014 +0200 When running unittests don't write to outside the build dir. This fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=743108 --- ooni/oonicli.py | 3 ++- ooni/settings.py | 18 ++++++++++++------ ooni/tests/__init__.py | 2 ++ ooni/tests/test_geoip.py | 11 ++++++++--- ooni/tests/test_nettest.py | 4 ++-- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 7693f34..846eadc 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -101,6 +101,7 @@ def runWithDirector(logging=True, start_tor=True): global_options = parseOptions() config.global_options = global_options config.set_paths() + config.initialize_ooni_home() config.read_config_file() if global_options['verbose']: config.advanced.debug = True @@ -175,7 +176,7 @@ def runWithDirector(logging=True, start_tor=True): sys.exit(5) d = director.start(start_tor=start_tor) - + def setup_nettest(_): try: return deck.setup() diff --git a/ooni/settings.py b/ooni/settings.py index 841b782..cd4e04b 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -3,15 +3,14 @@ import sys import yaml import getpass -from shutil import copyfile from os.path import abspath, expanduser -from twisted.internet import reactor, threads, defer - from ooni import otime, geoip from ooni.utils import Storage class OConfig(object): + _custom_home = None + def __init__(self): self.current_user = getpass.getuser() self.global_options = {} @@ -28,9 +27,11 @@ class OConfig(object): self.tor = Storage() self.privacy = Storage() self.set_paths() - self.initialize_ooni_home() - def set_paths(self): + def set_paths(self, ooni_home=None): + if ooni_home: + self._custom_home = ooni_home + if self.global_options.get('datadir'): self.data_directory = abspath(expanduser(self.global_options['datadir'])) elif self.advanced.get('data_dir'): @@ -43,6 +44,8 @@ class OConfig(object): self.nettest_directory = abspath(os.path.join(__file__, '..', 'nettests')) self.ooni_home = os.path.join(expanduser('~'+self.current_user), '.ooni') + if self._custom_home: + self.ooni_home = self._custom_home self.inputs_directory = os.path.join(self.ooni_home, 'inputs') self.decks_directory = os.path.join(self.ooni_home, 'decks') self.reports_directory = os.path.join(self.ooni_home, 'reports') @@ -56,7 +59,10 @@ class OConfig(object): if 'logfile' in self.basic: self.basic.logfile = expanduser(self.basic.logfile.replace('~','~'+self.current_user)) - def initialize_ooni_home(self): + def initialize_ooni_home(self, ooni_home=None): + if ooni_home: + self.set_paths(ooni_home) + if not os.path.isdir(self.ooni_home): print "Ooni home directory does not exist." print "Creating it in '%s'." % self.ooni_home diff --git a/ooni/tests/__init__.py b/ooni/tests/__init__.py index 2df8646..b0bbfbd 100644 --- a/ooni/tests/__init__.py +++ b/ooni/tests/__init__.py @@ -1,9 +1,11 @@ import socket from ooni.settings import config +config.initialize_ooni_home('ooni_home') config.logging = False config.advanced.debug = False + def is_internet_connected(): s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) try: diff --git a/ooni/tests/test_geoip.py b/ooni/tests/test_geoip.py index 49d2ea3..affcea6 100644 --- a/ooni/tests/test_geoip.py +++ b/ooni/tests/test_geoip.py @@ -1,3 +1,5 @@ +import os + from twisted.internet import defer from twisted.trial import unittest @@ -5,11 +7,12 @@ from ooni.tests import is_internet_connected from ooni.settings import config from ooni import geoip + class TestGeoIP(unittest.TestCase): def setUp(self): - config.set_paths() + config.initialize_ooni_home('ooni_home') config.read_config_file() - + def test_ip_to_location(self): location = geoip.IPToLocation('8.8.8.8') assert 'countrycode' in location @@ -19,7 +22,9 @@ class TestGeoIP(unittest.TestCase): @defer.inlineCallbacks def test_probe_ip(self): if not is_internet_connected(): - self.skipTest("You must be connected to the internet to run this test") + self.skipTest( + "You must be connected to the internet to run this test" + ) probe_ip = geoip.ProbeIP() res = yield probe_ip.lookup() assert len(res.split('.')) == 4 diff --git a/ooni/tests/test_nettest.py b/ooni/tests/test_nettest.py index ed0e4c5..92278ce 100644 --- a/ooni/tests/test_nettest.py +++ b/ooni/tests/test_nettest.py @@ -121,7 +121,7 @@ class TestNetTest(unittest.TestCase): for i in range(10): f.write("%s\n" % i) - from ooni.settings import config + config.initialize_ooni_home('ooni_home') config.read_config_file() def assertCallable(self, thing): @@ -298,7 +298,7 @@ class TestNettestTimeout(unittest.TestCase): def tearDown(self): self.factory.stopFactory() self.port.stopListening() - + def test_nettest_timeout(self): ntl = NetTestLoader(('-u', 'http://localhost:8007/')) ntl.loadNetTestString(http_net_test)

1 0

[ooni-probe/master] Merge pull request #307 from TheTorProject/fix/issue_h
by art＠torproject.org 30 Apr '14

30 Apr '14

commit 858f09d0e30f14568b38958a2c682f0abb0f4a64 Merge: 65c90a0 e3a8aa5 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Wed Apr 30 18:45:54 2014 +0200 Merge pull request #307 from TheTorProject/fix/issue_h Fix/issue h ooni/deck.py | 15 ++++++++++----- ooni/oonicli.py | 2 +- ooni/tests/test_deck.py | 19 ++++++++++++------- 3 files changed, 23 insertions(+), 13 deletions(-)

1 0

[tor/master] More .gitignore tweaks; goodbye latex; hello trs
by nickm＠torproject.org 30 Apr '14

30 Apr '14

commit 14efaa028382a75f97371cc15c3d0e49b7d7728d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 13:19:19 2014 -0400 More .gitignore tweaks; goodbye latex; hello trs We don't have any more latex files in Tor, so there's no reason to .gitignore all of the latex droppings. On the other hand, automake likes to use .trs files and .log for test suite outputs. --- .gitignore | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index efee905..de1eb04 100644 --- a/.gitignore +++ b/.gitignore @@ -13,15 +13,11 @@ *.gcno *.gcov *.gcda -# latex stuff -*.aux -*.dvi -*.blg -*.bbl -*.log # Autotools stuff .deps .dirstamp +*.trs +*.log # Stuff made by our makefiles *.bak # Python droppings

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 30 Apr '14

30 Apr '14

commit 48569ee37e36a0fd020f1b0d6599e1dbc5850ab4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 30 16:15:45 2014 +0000 Update translations for torbutton-torbuttonproperties --- ca/torbutton.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ca/torbutton.properties b/ca/torbutton.properties index 21fe833..80be9d7 100644 --- a/ca/torbutton.properties +++ b/ca/torbutton.properties @@ -40,11 +40,11 @@ torbutton.popup.use_tbb = Sembla que esteu usant Torbutton amb Firefox, el qual torbutton.popup.pref_error = Torbutton no pot actualitzar les preferències al directori de perfil del Tor Browser. torbutton.popup.permission_denied = Siusplau, o bé re-inicieu els permisos del directori Tor Browser o copieu-lo a una nova ubicació. torbutton.popup.device_full = Sembla que el disc és ple. Siusplau allibereu espai o moveu Tor Browser a un nou dispositiu. -torbutton.title.prompt_torbrowser = Important Torbutton Information -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. -torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. +torbutton.title.prompt_torbrowser = Informació important sobre Torbutton +torbutton.popup.prompt_torbrowser = Torbutton Funciona de forma diferent ara: ja no el pot tancar.\n\nHem fet aquest canvi per que l'ús de Torbutton en un navegador utilitzat també per navegar fora de l'entorn de Tor ja no es segur. Hi havien moltes incidències i no hem trobat cap altre solució per arreglar-les. \n\nSi desitja continuar utilitzant Firefox de forma habitual, ha de desinstalar Torbutton i descarregar Tor Browser Bundle. La seguretat de Tor Browser es millor que la de Firefox, fins i tot quan es fa servir Torbutton. \n\nPer desinstalar Torbutton, seleccioni Eines->Addons->Extensions and faci click sobre el botó Desinstalar al costat de Torbutton +torbutton.popup.short_torbrowser = Informació important sobre Torbutton! \n\nTorbutton ara és troba sempre activat.\n\nFaci click sobre Torbutton per més informació. -torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n +torbutton.popup.confirm_plugins = Alguns Plugins com Flash poden afectar la seva privacitat i el seu anonimat.\n\nTambé poden curt-circuitar Tor per revelar la ubicació actual i l'adreça IP.\n\nEstà segur de voler activar aquests plugins? \n\n torbutton.popup.never_ask_again = No torneu a preguntar # Canvas permission prompt. Strings are kept here for ease of translation.

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 30 Apr '14

30 Apr '14

commit 70bad596ffbc634838997886b9dc7d7f95b0eb5f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 30 15:15:46 2014 +0000 Update translations for torbutton-torbuttonproperties --- de/torbutton.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/de/torbutton.properties b/de/torbutton.properties index 3c4f5ee..c269cc1 100644 --- a/de/torbutton.properties +++ b/de/torbutton.properties @@ -23,8 +23,8 @@ torbutton.prefs.optional = (optional) torbutton.prefs.crucial = (kritisch) torbutton.popup.external.title = Einen externen Dateitypen herunterladen torbutton.popup.external.app = Tor-Browser kann diese Datei nicht anzeigen. Sie müssen es mit einer anderen Anwendung öffnen.\n\n -torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n -torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.external.note = Einige Dateitypen können Anwendungen dazu führen, dass sie sich mit dem Internet ohne Tor verbinden.\n\n +torbutton.popup.external.suggest = Um sicher zu sein, sollten Sie heruntergeladene Dateien nur öffnen, wenn Sie nicht mit dem Netz verbunden sind oder Sie benutzen eine Live-CD wie z. B. Tails.\n torbutton.popup.launch = Datei herunterladen torbutton.popup.cancel = Abbrechen torbutton.popup.dontask = Von jetzt an Dateien immer automatisch herunterladen @@ -48,8 +48,8 @@ torbutton.popup.confirm_plugins = Erweiterungen wie Flash können ihre Privatsph torbutton.popup.never_ask_again = Nicht mehr nachfragen # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Die Webseite (%S) hat versucht, auf Bilddaten von einem Canvas zuzugreifen. Da Canvas Bilddaten dazu benutzt werden können, um Informationen über ihren Rechner zu bekommen, wurden diesmal leere Bilddaten an die Webseite geschickt +canvas.siteprompt=Die Internetseite (%S) hat versucht, auf Bilddaten von einem Canvas zuzugreifen. Da Canvas-Bilddaten dazu benutzt werden können, um Informationen über ihren Rechner zu bekommen, wurden diesmal leere Bilddaten an die Internetseite geschickt. canvas.allow=In Zukunft Erlauben canvas.allowAccessKey=I -canvas.never=Niemals für diese Website +canvas.never=Niemals für diese Internetseite canvas.neverAccessKey=N

1 0

[tor/master] Update .gitignore for doc, contrib changes
by nickm＠torproject.org 30 Apr '14

30 Apr '14

commit 87e16087b74d1348a1500a24cce238a2463822dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 10:58:18 2014 -0400 Update .gitignore for doc, contrib changes In doc, restoring torify made us generate some .in files we didn't before. In contrib, we added tor.service.in, but didn't add tor.service to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 71737cf..efee905 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ # /contrib/ /contrib/dist/tor.sh /contrib/dist/torctl +/contrib/dist/tor.service /contrib/operator-tools/tor.logrotate /contrib/dist/suse/tor.sh @@ -101,7 +102,9 @@ /doc/tor-resolve.html.in /doc/tor-resolve.1.xml /doc/torify.1 +/doc/torify.1.in /doc/torify.html +/doc/torify.html.in /doc/torify.1.xml # /doc/spec/

1 0