Merge branch 'master' into new_api

1 files changed, 0 insertions, 4 deletions

diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h
index d4d18a4b..722430e0 100644
--- a/toxcore/TCP_client.h
+++ b/toxcore/TCP_client.h
@@ -78,10 +78,6 @@ typedef struct  {
     uint64_t ping_response_id;
     uint64_t ping_request_id;
 
-    //TODO: remove
-    void *net_crypto_pointer;
-    uint32_t net_crypto_location;
-
     struct {
         uint8_t status; /* 0 if not used, 1 if other is offline, 2 if other is online. */
         uint8_t public_key[crypto_box_PUBLICKEYBYTES];