[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit b7fac185a6c1b5b3543624234fc83a603e89af8d
Merge: 28cbcd0 36b2b48
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 25 16:59:46 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug18668          | 3 +++
 src/test/testing_common.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)