commit fdc3ad6259095b3f15eeb96e998bf078083449dd
Merge: be3a962ca 6443812e3
Author: teor <t...@torproject.org>
Date: Wed Jul 25 14:33:10 2018 +1000
Merge branch 'bug26924_029' into bug26924_032
changes/bug26924 | 4 ++++
src/or/connection_or.c | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --cc src/or/connection_or.c
index fd8c5fc7f,a01d08627..add0493d2
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@@ -46,12 -45,11 +46,13 @@@
#include "microdesc.h"
#include "networkstatus.h"
#include "nodelist.h"
+#include "proto_cell.h"
#include "reasons.h"
#include "relay.h"
+ #include "rendcommon.h"
#include "rephist.h"
#include "router.h"
+#include "routerkeys.h"
#include "routerlist.h"
#include "ext_orport.h"
#include "scheduler.h"
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
