make sure handler is set up on the correct circuit

relay.py

@@ -531,13 +531,13 @@ class SinglePassCreatedRelayHandler:
         # Remove ourselves from handling a second
         # SinglePassCreatedCircuitCell on this circuit
         circhandler.replace_celltype_handler(SinglePassCreatedCircuitCell, None)
+        logging.debug("WARNING: Unimplemented! have not yet implemented encrypting the reply directly to the client.")
 
         # Just forward a SinglePassCreatedCircuitCell back towards the
         # client
         circhandler.adjacent_circuit_handler.send_cell(
             SinglePassCreatedCircuitCell(cell.ntor_reply, self.next_snip))
 
-        sys.exit("ERROR ERROR have not yet implemented circuit handling for single-pass in relays")
 
 class CircuitHandler:
     """A class for managing sending and receiving encrypted cells on a
@@ -983,7 +983,7 @@ class RelayChannelManager(ChannelManager):
 
             # Add a handler for once the next relay replies to say that the
             # circuit has been created
-            circhandler.replace_celltype_handler(
+            newcirchandler.replace_celltype_handler(
                     SinglePassCreatedCircuitCell,
                     SinglePassCreatedRelayHandler(ntorreply, next_hop, vrf_output))