commit a4ab273a0dafdd85e8e9f204c6e3e092282d3620 parent 5199b9b33747ddcf787cf97d5e14b3b50a579802 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 20 Feb 2018 10:03:52 -0500 Merge remote-tracking branch 'fristonio/ticket-25261' Diffstat:
| A | changes/ticket25261 | | | 3 | +++ |
| M | src/or/connection.c | | | 1 | - |
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git 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. diff --git 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>