]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Apr 2014 00:30:30 +0000 (20:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Apr 2014 00:30:30 +0000 (20:30 -0400)
commit6a0dc0e585cbd9d53c91fe217adf2a4d4754694e
tree7345658d6a09b2b0f9487b0e66b3fa500f57836c
parent08ced4a7bf17f5c9d2868649dfa844248d15614e
parent47f7085de7a496b6bfa79de9e1b22ca4a28b0f27
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/dns.c