When accessing onion service with no fetchable descriptor, Tor sits around until timeout rather than hanging up

Running Tor git master, and trying to connect to an onion address that I just made up (nothing has ever been there):

$ torify telnet qiu3onp7v7z25u5i.onion 80
telnet: Unable to connect to remote host: Connection timed out

And on the Tor log I see

Sep 25 23:54:17.776 [notice] Tried for 120 seconds to get a connection to qiu3onp7v7z25u5i:80. Giving up. (waiting for rendezvous desc)

That is, it took 120 seconds to fail.

Compare to when using Tor release-0.2.5:

$ torify telnet qiu3onp7v7z25u5i.onion 80
telnet: Unable to connect to remote host: No route to host

and the Tor log says

Sep 26 00:06:37.515 [notice] Closing stream for 'qiu3onp7v7z25u5i.onion': hidden service is unavailable (try again later).

In the Tor 0.2.5 case, I got my answer in 5-10 seconds: it tried each of the hsdirs, and when the last one said 404, it hung up on the stream. In the Tor master case, it knew the answer in 5-10 seconds, but it just let my stream sit there doing nothing until the timeout arrived.