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

[nickm at torproject.org]

commit d5b3679392f90b8c6b533c32daceeaadc58b0dc9
Merge: 20d39e8 f6ffe53
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 5 23:56:21 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug18728             | 4 ++++
 src/ext/readpassphrase.c     | 2 ++
 src/ext/tor_readpassphrase.h | 2 ++
 src/test/test_util.c         | 3 ++-
 4 files changed, 10 insertions(+), 1 deletion(-)