Sync with maint

diff --git a/Makefile b/Makefile
index e53750ca01afbd7d777e62aa221f6861f66b0703..fef9c8d2725d6806d9ef4516de64c6d68bd7a7fe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -849,6 +849,7 @@ LIB_OBJS += pretty.o
 LIB_OBJS += prio-queue.o
 LIB_OBJS += progress.o
 LIB_OBJS += prompt.o
+LIB_OBJS += protocol.o
 LIB_OBJS += quote.o
 LIB_OBJS += reachable.o
 LIB_OBJS += read-cache.o