[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm at torproject.org]

commit c4b7b4ad4ba35b724fa90012adafd62e48ed7e42
Merge: 1e97b6a 7c7d990
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 19 08:29:52 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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