Merge branch 'fix_rendezvous_typo' of https://github.com/mig5/onionshare into mig5-fix_rendezvous_typo

This commit is contained in:
Micah Lee 2021-04-11 11:02:47 -07:00
commit cd966424b6
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73

View File

@ -747,13 +747,13 @@ class Onion(object):
# Wait for Tor rendezvous circuits to close # Wait for Tor rendezvous circuits to close
# Catch exceptions to prevent crash on Ctrl-C # Catch exceptions to prevent crash on Ctrl-C
try: try:
rendevouz_circuit_ids = [] rendezvous_circuit_ids = []
for c in self.c.get_circuits(): for c in self.c.get_circuits():
if ( if (
c.purpose == "HS_SERVICE_REND" c.purpose == "HS_SERVICE_REND"
and c.rend_query in self.graceful_close_onions and c.rend_query in self.graceful_close_onions
): ):
rendevouz_circuit_ids.append(c.id) rendezvous_circuit_ids.append(c.id)
symbols = [c for c in "\\|/-"] symbols = [c for c in "\\|/-"]
symbols_i = 0 symbols_i = 0
@ -761,7 +761,7 @@ class Onion(object):
while True: while True:
num_rend_circuits = 0 num_rend_circuits = 0
for c in self.c.get_circuits(): for c in self.c.get_circuits():
if c.id in rendevouz_circuit_ids: if c.id in rendezvous_circuit_ids:
num_rend_circuits += 1 num_rend_circuits += 1
if num_rend_circuits == 0: if num_rend_circuits == 0: