@@ -62,12 +62,12 @@
 
 static of_run_loop_mode_t connectRunLoopMode = @"of_tcp_socket_connect_mode";
 static OFString *defaultSOCKS5Host = nil;
 static uint16_t defaultSOCKS5Port = 1080;
 
-@interface OFTCPSocket_AsyncConnectContext: OFObject <OFTCPSocketDelegate,
-    OFTCPSocketDelegate_Private>
+@interface OFTCPSocket_AsyncConnectDelegate: OFObject <OFTCPSocketDelegate,
+    OFTCPSocketDelegate_Private, OFDNSResolverDelegate>
 {
 	OFTCPSocket *_socket;
 	OFString *_host;
 	uint16_t _port;
 	OFString *_SOCKS5Host;
@@ -106,15 +106,10 @@
 		    SOCKS5Port: (uint16_t)SOCKS5Port
 			 block: (of_tcp_socket_async_connect_block_t)block;
 #endif
 - (void)didConnect;
 - (void)tryNextAddressWithRunLoopMode: (of_run_loop_mode_t)runLoopMode;
--	(void)resolver: (OFDNSResolver *)resolver
-  didResolveDomainName: (OFString *)domainName
-       socketAddresses: (OFData *)socketAddresses
-	       context: (id)context
-	     exception: (id)exception;
 - (void)startWithRunLoopMode: (of_run_loop_mode_t)runLoopMode;
 - (void)sendSOCKS5Request;
 @end
 
 @interface OFTCPSocket_ConnectDelegate: OFObject <OFTCPSocketDelegate>
@@ -123,11 +118,11 @@
 	bool _done;
 	id _exception;
 }
 @end
 
-@implementation OFTCPSocket_AsyncConnectContext
+@implementation OFTCPSocket_AsyncConnectDelegate
 - (instancetype)initWithSocket: (OFTCPSocket *)sock
 			  host: (OFString *)host
 			  port: (uint16_t)port
 		    SOCKS5Host: (OFString *)SOCKS5Host
 		    SOCKS5Port: (uint16_t)SOCKS5Port
@@ -302,11 +297,10 @@
 }
 
 -	(void)resolver: (OFDNSResolver *)resolver
   didResolveDomainName: (OFString *)domainName
        socketAddresses: (OFData *)socketAddresses
-	       context: (id)context
 	     exception: (id)exception
 {
 	if (exception != nil) {
 		_exception = [exception retain];
 		[self didConnect];
@@ -351,16 +345,11 @@
 
 	[[OFThread DNSResolver]
 	    asyncResolveSocketAddressesForHost: host
 				 addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY
 				   runLoopMode: runLoopMode
-					target: self
-				      selector: @selector(resolver:
-						    didResolveDomainName:
-						    socketAddresses:context:
-						    exception:)
-				       context: nil];
+				      delegate: self];
 }
 
 - (void)sendSOCKS5Request
 {
 	OFData *data = [OFData dataWithItems: "\x05\x01\x00"
@@ -728,11 +717,11 @@
 		      port: (uint16_t)port
 	       runLoopMode: (of_run_loop_mode_t)runLoopMode
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[[[[OFTCPSocket_AsyncConnectContext alloc]
+	[[[[OFTCPSocket_AsyncConnectDelegate alloc]
 		  initWithSocket: self
 			    host: host
 			    port: port
 		      SOCKS5Host: _SOCKS5Host
 		      SOCKS5Port: _SOCKS5Port
@@ -758,11 +747,11 @@
 	       runLoopMode: (of_run_loop_mode_t)runLoopMode
 		     block: (of_tcp_socket_async_connect_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[[[[OFTCPSocket_AsyncConnectContext alloc]
+	[[[[OFTCPSocket_AsyncConnectDelegate alloc]
 		  initWithSocket: self
 			    host: host
 			    port: port
 		      SOCKS5Host: _SOCKS5Host
 		      SOCKS5Port: _SOCKS5Port