diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-18 14:27:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-18 14:27:00 -0400 |
| commit | 54d6e5e71e604ffedcb3c0a2aeff4b39bc9e37db (patch) | |
| tree | dc45202d8c3b636fd84abef68b28f252234fe01e /src/or/main.c | |
| parent | 9bdce9d4e5fd164b05e1ae87ab0f629d2cd38e42 (diff) | |
| parent | 21fd94ddb81327a339a942fb5d134cb6ebb5a998 (diff) | |
| download | tor-54d6e5e71e604ffedcb3c0a2aeff4b39bc9e37db.tar.gz tor-54d6e5e71e604ffedcb3c0a2aeff4b39bc9e37db.zip | |
Merge remote-tracking branch 'public/feature15053'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index ddb4529904..a816fad2bb 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -63,7 +63,7 @@ #include <openssl/crypto.h> #endif #include "memarea.h" -#include "../common/sandbox.h" +#include "sandbox.h" #ifdef HAVE_EVENT2_EVENT_H #include <event2/event.h> |