commit d6115a890762f215bf21a48f5888c25c6a2b500e Merge: f58f9f8 0162325 Author: Isis Lovecruft <isis@torproject.org> Date: Sun Feb 1 01:13:59 2015 +0000 Merge branch 'hotfix/0.2.3-pyopenssl-0.14' into develop requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)