Merge pull request stellar#1219 from vogel/test-improvements

Test improvements

Reviewed-by: stanford-scs

Merge pull request stellar#1170 from vogel/keep-cache-longer

Keep cache longer

Reviewed-by: jedmccaleb

Merge pull request stellar#1156 from stellar/next-db-and-proto-3

Next db and proto 3

Reviewed-by: vogel

Merge pull request stellar#1089 from raymens/fix-windows

Fix windows (VS) compile errors.

Reviewed-by: jedmccaleb

Merge pull request stellar#1021 from jedmccaleb/master

fix bugs with meta

Merge pull request stellar#972 from graydon/inferquorum

Inferquorum

Reviewed-by: jedmccaleb

Merge pull request stellar#961 from MonsieurNicolas/filterQSetFix

filtering fix: use companion quorum set from statements

Reviewed-by: graydon

Merge pull request stellar#943 from graydon/bug-937-catchup-fail-and-…

…reset

Bug 937 catchup fail and reset

Reviewed-by: jedmccaleb

Merge pull request stellar#930 from MonsieurNicolas/scpCrashFix

fix: crash in SCP when receiving some v-blocking CONFIRM

Reviewed-by: jedmccaleb

Merge pull request stellar#926 from MonsieurNicolas/scpFixupNovember17

Scp fixup november 17

Reviewed-by: jedmccaleb