summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/or/Makefile.am4
-rw-r--r--src/or/circuitbuild.c2
-rw-r--r--src/or/config.c2
-rw-r--r--src/or/main.c2
-rw-r--r--src/or/transports.c4
-rw-r--r--src/or/transports.h8
-rw-r--r--src/test/test_pt.c2
7 files changed, 12 insertions, 12 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index 4dc5ee55f6..41e89d7419 100644
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -39,7 +39,7 @@ libtor_a_SOURCES = \
networkstatus.c \
nodelist.c \
onion.c \
- pluggable_transports.c \
+ transports.c \
policies.c \
reasons.c \
relay.c \
@@ -105,7 +105,7 @@ noinst_HEADERS = \
ntmain.h \
onion.h \
or.h \
- pluggable_transports.h \
+ transports.h \
policies.h \
reasons.h \
relay.h \
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 003f579e75..3dba83ba30 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -26,7 +26,7 @@
#include "nodelist.h"
#include "onion.h"
#include "policies.h"
-#include "pluggable_transports.h"
+#include "transports.h"
#include "relay.h"
#include "rephist.h"
#include "router.h"
diff --git a/src/or/config.c b/src/or/config.c
index 5f2f11dddf..da35270b4b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -35,7 +35,7 @@
#include "router.h"
#include "util.h"
#include "routerlist.h"
-#include "pluggable_transports.h"
+#include "transports.h"
#ifdef MS_WINDOWS
#include <shlobj.h>
#endif
diff --git a/src/or/main.c b/src/or/main.c
index d79d9ebaaa..5294e4ad0d 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -37,7 +37,7 @@
#include "ntmain.h"
#include "onion.h"
#include "policies.h"
-#include "pluggable_transports.h"
+#include "transports.h"
#include "relay.h"
#include "rendclient.h"
#include "rendcommon.h"
diff --git a/src/or/transports.c b/src/or/transports.c
index 49b0e131af..aae39cd8f0 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -2,7 +2,7 @@
/* See LICENSE for licensing information */
/**
- * \file pluggable_transports.c
+ * \file transports.c
* \brief Pluggable Transports related code.
**/
@@ -10,7 +10,7 @@
#include "or.h"
#include "config.h"
#include "circuitbuild.h"
-#include "pluggable_transports.h"
+#include "transports.h"
/* ASN TIDY THESE UP*/
static void set_environ(char ***envp, const char *method,
diff --git a/src/or/transports.h b/src/or/transports.h
index 80d5429e70..17a68030d7 100644
--- a/src/or/transports.h
+++ b/src/or/transports.h
@@ -4,12 +4,12 @@
/* See LICENSE for licensing information */
/**
- * \file pluggable_transpots.h
- * \brief Headers for pluggable_transpots.c
+ * \file transports.h
+ * \brief Headers for transports.c
**/
-#ifndef TOR_PLUGGABLE_TRANSPORTS_H
-#define TOR_PLUGGABLE_TRANSPORTS_H
+#ifndef TOR_TRANSPORTS_H
+#define TOR_TRANSPORTS_H
int pt_managed_launch_proxy(const char *method,
char **proxy_argv, int is_server);
diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index 02950b8daa..99fc5145e0 100644
--- a/src/test/test_pt.c
+++ b/src/test/test_pt.c
@@ -6,7 +6,7 @@
#include "orconfig.h"
#define PT_PRIVATE
#include "or.h"
-#include "pluggable_transports.h"
+#include "transports.h"
#include "circuitbuild.h"
#include "test.h"