diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-02-15 15:58:54 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-02-15 15:58:54 -0500 |
commit | 0fa362cafa49bf8e7914a1bad0a76a64baef3a84 (patch) | |
tree | ec156585b2a7a5371b2859c1f8ce9a57e3471e89 /src/or/circuitbuild.c | |
parent | 6c8b6e9e78429297e8d73a502d10dacf47efeea3 (diff) | |
parent | d7089ff228227259137b5a8bc32d0764a0ad4155 (diff) | |
download | tor-0fa362cafa49bf8e7914a1bad0a76a64baef3a84.tar.gz tor-0fa362cafa49bf8e7914a1bad0a76a64baef3a84.zip |
Merge remote-tracking branch 'public/feature4994-rebased'
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r-- | src/or/circuitbuild.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 163afd3d29..45da6b02a5 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -25,6 +25,7 @@ #include "directory.h" #include "entrynodes.h" #include "main.h" +#include "microdesc.h" #include "networkstatus.h" #include "nodelist.h" #include "onion.h" |