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

[nickm at torproject.org]

commit a7a44f2db0b6732ed53a24186dc09eea50296a20
Merge: d718c71 7c7d990
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 19 08:29:58 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug18809    | 2 +-
 src/test/test_dir.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)