Nick Mathewson 4aa4bce474 Merge remote-tracking branch 'rransom-tor/bug3335-v2' ... Conflicts: src/or/connection_edge.c src/or/rendclient.c		2011-10-03 15:06:07 -04:00
..
bug1297b	Clear the timed_out flag when an HS connection attempt ends	2011-10-02 12:49:35 -07:00
bug3335	Remove an HS's last_hid_serv_requests entries when a conn. attempt ends	2011-10-02 16:19:36 -07:00
bug3825a	Detect and remove unreachable intro points	2011-10-02 12:49:35 -07:00
bug4094	Add changes file for bug 4094	2011-10-03 12:58:07 -04:00