]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Mon, 12 Jan 2015 05:59:48 +0000 (00:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 12 Jan 2015 05:59:48 +0000 (00:59 -0500)
commit2d123efe7c98765fae17af747b266ea8cc0b4b5c
treed9132cd506dfe7254948a3461fa4bf97e06f138b
parent2dac77c041df0a6b69cde43216f6e17812193d60
parentc9dd2d1a6ad2684442abb7a31e29b0998aaf605c
Merge remote-tracking branch 'origin/maint-0.2.5'
src/or/dns.c