summaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-02-20 10:03:52 -0500
committerNick Mathewson <nickm@torproject.org>2018-02-20 10:03:52 -0500
commita4ab273a0dafdd85e8e9f204c6e3e092282d3620 (patch)
tree5373e64dc5d3947af5b3f25ac3062ee261768913 /src/or/connection.c
parent5199b9b33747ddcf787cf97d5e14b3b50a579802 (diff)
parent35533833122942fe226b6bb6cadd6a39f7e050c4 (diff)
downloadtor-a4ab273a0dafdd85e8e9f204c6e3e092282d3620.tar.gz
tor-a4ab273a0dafdd85e8e9f204c6e3e092282d3620.zip
Merge remote-tracking branch 'fristonio/ticket-25261'
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 734e99c0b4..5532551cfe 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -101,7 +101,6 @@
#include "transports.h"
#include "routerparse.h"
#include "sandbox.h"
-#include "transports.h"
#ifdef HAVE_PWD_H
#include <pwd.h>