]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug15760_hard_026_v2'
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Jun 2015 17:45:27 +0000 (13:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Jun 2015 17:45:27 +0000 (13:45 -0400)
commit0030765e04d8dfe3dfaf8124b01a4d578b7d8ceb
treee74d715553f1798a0eea21a96e2a83b8230d6167
parent3d653dff5e891c1e547ef7eacbc991410a98c1cb
parentff835e23280c0f29ca9ab25bfc3069276c0b8ab6
Merge remote-tracking branch 'public/bug15760_hard_026_v2'

Conflicts:
src/common/tortls.c
configure.ac
src/common/tortls.c