diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-20 10:03:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-20 10:03:52 -0500 |
| commit | a4ab273a0dafdd85e8e9f204c6e3e092282d3620 (patch) | |
| tree | 5373e64dc5d3947af5b3f25ac3062ee261768913 | |
| parent | 5199b9b33747ddcf787cf97d5e14b3b50a579802 (diff) | |
| parent | 35533833122942fe226b6bb6cadd6a39f7e050c4 (diff) | |
| download | tor-a4ab273a0dafdd85e8e9f204c6e3e092282d3620.tar.gz tor-a4ab273a0dafdd85e8e9f204c6e3e092282d3620.zip | |
Merge remote-tracking branch 'fristonio/ticket-25261'
| -rw-r--r-- | changes/ticket25261 | 3 | ||||
| -rw-r--r-- | src/or/connection.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/ticket25261 b/changes/ticket25261 new file mode 100644 index 0000000000..604a09d975 --- /dev/null +++ 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 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> |