Merge remote-tracking branch 'mercury-internal/trunk'

Makefile

@@ -155,14 +155,21 @@ coverage_report: clean
 	cd unit_tests && gcovr -r ../src/libmerc
 
 .PHONY: doc
-doc: doc/mercury.pdf
+doc: doc/mercury.pdf sphinx
 
 doc/mercury.pdf:
 	doxygen
 	cd doc/latex; make; mv refman.pdf ../mercury.pdf
 
-.PHONY: clean
-clean:
+.PHONY: sphinx sphinx-clean
+sphinx:
+	cd doc/sphinx && $(MAKE) html
+
+sphinx-clean:
+	cd doc/sphinx && $(MAKE) clean
+
+.PHONY:
+clean: sphinx-clean
 	for file in Makefile README.md configure.ac Doxyfile; do if [ -e "$$file~" ]; then rm -f "$$file~" ; fi; done
 ifneq ($(wildcard src/Makefile), src/Makefile)
 	@echo $(COLOR_RED) "error: run ./configure before running make (src/Makefile is missing)" $(COLOR_OFF)

VERSION

@@ -1 +1 @@
-2.5.20
+2.5.21

doc/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG for Mercury
 
+## Version 2.5.21
+
+* Fixed a slow memory leak in TCP reassembly
+* Optimized LRU cache in `fingerprint_prevalence::update()`, and changed locking strategy to minimize thread contention
+* New cython function `perform_analysis_with_weights`
+
 ## Version 2.5.20
 
 * Added support to parse IP pkts encapsulated in SGT or Cisco Metadata.

doc/batch-gcd.md

@@ -29,20 +29,21 @@ Authors: Brandon Enright, Andrew Chi, David McGrew
 
 ## Installation
 
-The easiest way to try Batch GCD is to use the Docker image of the `mercury`
-package, hosted at the path `ghcr.io/cisco/mercury:latest`.  We also provide
-instructions for building the mercury package from source.
+The easiest way to try Batch GCD is by building a Docker image of the `mercury`
+package.  We also provide instructions for building the mercury package from source.
 
 ### Docker
 
 The Docker image for `mercury` also includes the tools `batch_gcd`,
 `cert_analyze`, and `tls_scanner`.  Note that depending on your Docker
 configuration, the docker command may require sudo.
 ```
-$ docker pull ghcr.io/cisco/mercury:latest
-$ alias batch_gcd='docker run --rm -i --entrypoint /usr/local/bin/batch_gcd --volume .:/root ghcr.io/cisco/mercury:latest'
-$ alias cert_analyze='docker run --rm -i --entrypoint /usr/local/bin/cert_analyze --volume .:/root ghcr.io/cisco/mercury:latest'
-$ alias tls_scanner='docker run --rm -i --entrypoint /usr/local/bin/tls_scanner --volume .:/root ghcr.io/cisco/mercury:latest'
+$ git clone https://github.com/cisco/mercury.git
+$ cd mercury
+$ docker build -t mercury:latest .
+$ alias batch_gcd='docker run --rm -i --entrypoint /usr/local/bin/batch_gcd --volume .:/root mercury:latest'
+$ alias cert_analyze='docker run --rm -i --entrypoint /usr/local/bin/cert_analyze --volume .:/root mercury:latest'
+$ alias tls_scanner='docker run --rm -i --entrypoint /usr/local/bin/tls_scanner --volume .:/root mercury:latest'
 ```
 You can then run the commands with `--help`.  For example: `batch_gcd --help`.