From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 25 Jun 2015 14:53:13 +0000 (-0400)
Subject: Merge branch 'readpassphrase_v2'
X-Git-Tag: tor-0.2.7.2-alpha~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07e1e754f38f1f880cafdb2a9fc421d0105607f3;p=thirdparty%2Ftor.git

Merge branch 'readpassphrase_v2'
---

07e1e754f38f1f880cafdb2a9fc421d0105607f3