Merge remote-tracking branch 'fristonio/ticket-25261'

2018-02-20 10:03:52 -05:00 · 2018-02-20 10:03:52 -05:00 · a4ab273a0d
parent 5199b9b337 3553383312
commit a4ab273a0d
2 changed files with 3 additions and 1 deletions
--- a/changes/ticket25261
+++ b/changes/ticket25261
@ -0,0 +1,3 @@
+  o Minor bugfix (Multiple includes):
+    - Fixed multiple includes of trasports.h in src/or/connection.c
+      Fixes bug 25261; bugfix on 0.2.5.1-alpha.
--- 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>