Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
commit22b9caf0ae42132bc8107d990b3ebb969394c90f
authorNick Mathewson <nickm@torproject.org>
Thu, 16 Oct 2014 13:08:52 +0000 (16 09:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 16 Oct 2014 13:08:52 +0000 (16 09:08 -0400)
treeb1289116f40378bccfcbb29a3f5f819ab859629e
parentd315b8e8bc712f881fcc70624cb135a8e3855f63
parent943fd4a252ad252d7d594622d5988634ddf8f1fc
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
src/common/tortls.c