Merge remote-tracking branch 'public/bug13325_024' into maint-0.2.5
commitd315b8e8bc712f881fcc70624cb135a8e3855f63
authorNick Mathewson <nickm@torproject.org>
Fri, 3 Oct 2014 23:57:41 +0000 (3 19:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 3 Oct 2014 23:57:41 +0000 (3 19:57 -0400)
treecd6ba7cafb68055bfc730d0b7928956389c478a4
parente1a25f0c3602e007872277ef9ab437cc97cfd47b
parentd1fa0163e571913b8e4972c5c8a2d46798f46156
Merge remote-tracking branch 'public/bug13325_024' into maint-0.2.5
configure.ac
src/common/tortls.c