commit b0c1634ce93b394ad398ccd37e465cc8f1a356ff Merge: 8b91680d5 4874b0006 Author: Nick Mathewson nickm@torproject.org Date: Sat Nov 16 15:29:14 2019 -0500

Merge remote-tracking branch 'tor-github/pr/1544'

src/feature/dircommon/consdiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)