Merge branch 'master' into EIGRP

diff --cc configure.ac
Simple merge

diff --cc lib/Makefile.am
index c33893be6af7cd6b6f759d53db7c06362d513bcd,ad8a488689e17eb1ce21222b69aa9a0a2d915781..6e3c6d680d435e5b8ca41e0fbb7a0d59ede151da
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -32,9 -32,9 +32,10 @@@ libfrr_la_SOURCES = 
        libfrr.c \
        strlcpy.c \
        strlcat.c \
 +      sha256.c \
        module.c \
        hook.c \
+       frr_pthread.c \
        # end
  
  BUILT_SOURCES = route_types.h gitversion.h command_parse.h command_lex.h
@@@ -75,7 -75,7 +76,8 @@@ pkginclude_HEADERS = 
        module.h \
        hook.h \
        libfrr.h \
 +      sha256.h \
+       frr_pthread.h \
        # end
  
  noinst_HEADERS = \

diff --cc lib/command.c
Simple merge

diff --cc lib/command.h
Simple merge

diff --cc lib/vty.c
Simple merge

diff --cc tools/frr
Simple merge

diff --cc vtysh/vtysh.c
Simple merge