Merge branch 'maint-0.4.4' into maint-0.4.5

diff --cc .gitignore
Simple merge

diff --cc Makefile.am
index 6e8ba37e3a2ab0bb4926b0bfaeb7d692e68b3575,a723c167ef83b17d36d2c8050373b7ee2c87e56a..3056b084469f771e6201c7d1c8d2d4dfc6634834
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -721,7 -702,21 +721,21 @@@ show-distdir-core
          file $(distdir)/_build/core; fi
  
  show-libs:
 -      @echo $(TOR_INTERNAL_LIBS)
 +      @echo libtor.a
  
  show-testing-libs:
 -      @echo $(TOR_INTERNAL_TESTING_LIBS)
 +      @echo src/test/libtor-testing.a
+ 
+ # Note here that we hardcode this -j2 because if the user would pass too many
+ # cores, bear actually chockes and dies :S. For this to work, a make clean
+ # needs to be done else bear will miss some compile flags.
+ lsp:
+       @if test -x "`which bear 2>&1;true`"; then \
+               echo "Generating LSP compile_commands.json. Might take few minutes..."; \
+               $(MAKE) clean 2>&1 >/dev/null; \
+               bear >/dev/null 2>&1 -- $(MAKE) -j2 2>&1 >/dev/null; \
+               echo "Generating .ccls file..."; \
+               ./scripts/maint/gen_ccls_file.sh \
+       else \
+               echo "No bear command found. On debian, apt install bear"; \
+       fi