Merge branch 'tor-github/pr/984'

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

diff --cc scripts/maint/practracker/exceptions.txt
Simple merge

diff --cc src/core/include.am
index c228735f1b0139b668f053e900be58328a42390b,2533a4990f6bf4ca101e31adfa8c9cf795f21830..9493f795528a14b110f87e8b8cf088531ae40ee5
--- 1/src/core/include.am
--- 2/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         \