Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Honor --tor PATH argument #28

Closed
wants to merge 1 commit into from
Closed

Honor --tor PATH argument #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tornettools/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def __tgen_client(args, name, country, tgenrc_fname):
host["processes"] = []

process = {}
process["path"] = "{}/bin/tor".format(SHADOW_INSTALL_PREFIX)
process["path"] = args.torexe
process["args"] = __format_tor_args(name)
process["start_time"] = BOOTSTRAP_LENGTH_SECONDS-60 # start before boostrapping ends

Expand Down Expand Up @@ -241,7 +241,7 @@ def __tor_relay(args, relay, orig_fp, is_authority=False):
host['processes'] = []

process = {}
process["path"] = "{}/bin/tor".format(SHADOW_INSTALL_PREFIX)
process["path"] = args.torexe
process["args"] = str(__format_tor_args(relay['nickname']))
process["start_time"] = starttime

Expand Down