From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 10 Apr 2018 18:26:29 +0000 (-0400)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.1
X-Git-Tag: tor-0.3.2.11~38^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db6902c23530f8d58e999701685e9cbd74b15a82;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.1
---

db6902c23530f8d58e999701685e9cbd74b15a82
diff --cc src/or/include.am
index 5d5ff5c41d,19cf00264b..7548ed0946
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -144,10 -127,9 +144,11 @@@ endi
  
  ORHEADERS = \
  	src/or/addressmap.h				\
+ 	src/or/auth_dirs.inc				\
 +	src/or/bridges.h				\
  	src/or/buffers.h				\
  	src/or/channel.h				\
 +	src/or/channelpadding.h				\
  	src/or/channeltls.h				\
  	src/or/circpathbias.h				\
  	src/or/circuitbuild.h				\