Commit e6366f78 authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

Merge branch 'bug26535_032' into maint-0.3.2

parents 3c97b148 3baf3d01
o Minor bugfixes (testing, compatibility):
- When running the test, make sure only to pass strings
(rather than "bytes" objects) to the Python subprocess module.
Python 3 on Windows seems to require this. Fixes bug 26535; bugfix on
......@@ -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")
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,
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment