diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-03 09:48:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-03 09:48:03 -0400 |
| commit | 228d25ddf641f02a38e1cd6386d7e603b9478a9d (patch) | |
| tree | 1cce531c6bdf732aad142d1627245c3008c47276 /src/test/hs_ntor_ref.py | |
| parent | a9628c0c0b2cc5c0286c4e49591b3b18dc054e87 (diff) | |
| parent | d38e474950ab41ad3593dc94de9a240f02938679 (diff) | |
| download | tor-228d25ddf641f02a38e1cd6386d7e603b9478a9d.tar.gz tor-228d25ddf641f02a38e1cd6386d7e603b9478a9d.zip | |
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src/test/hs_ntor_ref.py')
| -rw-r--r-- | src/test/hs_ntor_ref.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py index f892cd8f84..0c5756ad73 100644 --- a/src/test/hs_ntor_ref.py +++ b/src/test/hs_ntor_ref.py @@ -234,8 +234,11 @@ Utilities for communicating with the little-t-tor ntor wrapper to conduct the integration tests """ -PROG = b"./src/test/test-hs-ntor-cl" -enhex=lambda s: binascii.b2a_hex(s) +PROG = "./src/test/test-hs-ntor-cl" +if sys.version_info[0] >= 3: + enhex=lambda s: binascii.b2a_hex(s).decode("ascii") +else: + enhex=lambda s: binascii.b2a_hex(s) dehex=lambda s: binascii.a2b_hex(s.strip()) def tor_client1(intro_auth_pubkey_str, intro_enc_pubkey, |