diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-03 13:50:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-03 13:50:18 -0400 |
| commit | c3b72583709332f051fb61e17f5102d0ada05917 (patch) | |
| tree | a686097afdcda0074eb00d7b6e667abf91dc19e5 /src/common/crypto_format.c | |
| parent | 94c6eb7d7f023e50071632e618f003409e5e6489 (diff) | |
| parent | 94dcd38a1430061a0bb630ad680a41a78262a55c (diff) | |
| download | tor-c3b72583709332f051fb61e17f5102d0ada05917.tar.gz tor-c3b72583709332f051fb61e17f5102d0ada05917.zip | |
Merge remote-tracking branch 'isis/bug24660_r1'
Diffstat (limited to 'src/common/crypto_format.c')
| -rw-r--r-- | src/common/crypto_format.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/crypto_format.c b/src/common/crypto_format.c index 3f6fb9f54c..460e85bac1 100644 --- a/src/common/crypto_format.c +++ b/src/common/crypto_format.c @@ -15,11 +15,11 @@ #include <sys/stat.h> #endif #include "container.h" -#include "crypto.h" #include "crypto_curve25519.h" +#include "crypto_digest.h" #include "crypto_ed25519.h" #include "crypto_format.h" -#include "crypto_digest.h" +#include "crypto_util.h" #include "util.h" #include "util_format.h" #include "torlog.h" |