From: teor <teor@torproject.org>
Date: Wed, 25 Jul 2018 04:33:10 +0000 (+1000)
Subject: Merge branch 'bug26924_029' into bug26924_032
X-Git-Tag: tor-0.3.2.12~23^2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fdc3ad6259095b3f15eeb96e998bf078083449dd;p=thirdparty%2Ftor.git

Merge branch 'bug26924_029' into bug26924_032
---

fdc3ad6259095b3f15eeb96e998bf078083449dd
diff --cc src/or/connection_or.c
index fd8c5fc7f2,a01d086279..add0493d23
--- 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"