[tor-commits] [tor/master] Merge branch 'readpassphrase_v2'

[nickm at torproject.org]

commit 07e1e754f38f1f880cafdb2a9fc421d0105607f3
Merge: fce2a15 272229f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 25 10:53:13 2015 -0400

    Merge branch 'readpassphrase_v2'

 LICENSE                  |   19 ++++
 configure.ac             |    2 +
 src/common/compat.c      |   84 ++++++++++++++----
 src/common/include.am    |    9 +-
 src/ext/README           |    3 +
 src/ext/include.am       |    1 +
 src/ext/readpassphrase.c |  220 ++++++++++++++++++++++++++++++++++++++++++++++
 src/ext/readpassphrase.h |   46 ++++++++++
 8 files changed, 366 insertions(+), 18 deletions(-)