Which of the following is the definition of a buffer solution?

Solution composed of a weak acid and its conjugate base AND solution that can maintain a nearly constant pH even with addition of small amounts of acid or base