aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-07-17 12:05:08 -0400
committerNick Mathewson <nickm@torproject.org>2012-07-17 12:05:08 -0400
commitec8bdc5da81a27fd0d382db689addd8114347e1e (patch)
treef31941c4b0d5c35d0563caddb741f0acb200cbf5 /src/or/connection.c
parentf9478b7a796a784a2d8f12fb9701ce7d1ea1ace2 (diff)
parent8b9f4d75f27728ca5f07c1eb00d4144cb3b33eac (diff)
downloadtor-ec8bdc5da81a27fd0d382db689addd8114347e1e.tar
tor-ec8bdc5da81a27fd0d382db689addd8114347e1e.tar.gz
Merge remote-tracking branch 'asn/bug3589'
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 95101ef65..6c9b03b0b 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -34,6 +34,7 @@
#include "rendcommon.h"
#include "rephist.h"
#include "router.h"
+#include "transports.h"
#include "routerparse.h"
#ifdef USE_BUFFEREVENTS