From: David Goulet <dgoulet@torproject.org>
Date: Fri, 3 May 2019 14:56:12 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/984'
X-Git-Tag: tor-0.4.1.1-alpha~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3492d53c3f643a1e6b2e62bb8b2ad5bfa77213e;p=thirdparty%2Ftor.git

Merge branch 'tor-github/pr/984'

Signed-off-by: David Goulet <dgoulet@torproject.org>
---

b3492d53c3f643a1e6b2e62bb8b2ad5bfa77213e
diff --cc src/core/include.am
index c228735f1b,2533a4990f..9493f79552
--- a/src/core/include.am
+++ b/src/core/include.am
@@@ -81,8 -79,10 +81,9 @@@ LIBTOR_APP_A_SOURCES = 				
  	src/feature/control/control_events.c	\
  	src/feature/control/control_fmt.c	\
  	src/feature/control/control_getinfo.c	\
+ 	src/feature/control/control_proto.c	\
  	src/feature/control/fmt_serverstatus.c  \
  	src/feature/control/getinfo_geoip.c	\
 -	src/feature/dirauth/keypin.c		\
  	src/feature/dircache/conscache.c	\
  	src/feature/dircache/consdiffmgr.c	\
  	src/feature/dircache/dircache.c		\