Merge branch 'maint-0.2.9' into maint-0.3.2

  o Minor bugfixes (testing, compatibility):

    - When running the ntor_ref.py 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

      0.2.5.5-alpha.

       Call the test-ntor-cl command-line program to make sure we can

       interoperate with Tor's ntor program

    """

    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())

    PROG = b"./src/test/test-ntor-cl"

    PROG = "./src/test/test-ntor-cl"

    def tor_client1(node_id, pubkey_B):

        " returns (msg, state) "

        p = subprocess.Popen([PROG, b"client1", enhex(node_id),

        p = subprocess.Popen([PROG, "client1", enhex(node_id),

                              enhex(pubkey_B.serialize())],

                             stdout=subprocess.PIPE)

        return map(dehex, p.stdout.readlines())