commit f6ffe532ab6fb72f120258d27069e8e68959f9b3 Merge: d037369 d7a0382 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 5 23:56:05 2016 -0400

Merge branch 'bug18728_028' into 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(-)