Merge remote-tracking branch 'origin/master' into topic/johanna/ocsp-new

This commit is contained in:
Johanna Amann 2017-03-16 12:28:08 -07:00
commit 7aa219758c
99 changed files with 2110 additions and 795 deletions

View file

@ -596,7 +596,7 @@ int main(int argc, char** argv)
break;
case 'v':
fprintf(stderr, "%s version %s\n", prog, bro_version());
fprintf(stdout, "%s version %s\n", prog, bro_version());
exit(0);
break;