tor-parallel-relay-conn/changes/bug1297b

  o Minor bugfixes:

    - Don't close hidden service client circuits which have almost
      finished connecting to their destination when they reach the
      normal circuit-build timeout.  Previously, we would close
      introduction circuits which are waiting for an acknowledgement
      from the introduction-point relay and rendezvous circuits which
      have been specified in an INTRODUCE1 cell sent to a hidden
      service after the normal CBT; now, we mark them as 'timed out',
      and launch another rendezvous attempt in parallel.  Fixes part
      of bug 1297.