]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'bug18710_025' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Wed, 4 May 2016 18:47:04 +0000 (14:47 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 4 May 2016 18:47:04 +0000 (14:47 -0400)
commit31332a878db0d8f8d53fe4e535ec9ae812675315
tree91e823807e5cb7a650a96d05aa785d1d18dd9d6e
parent8f292f1c33b033f36e17969f206c9332c0241e9a
parent0ca3f495c6fad074606ab75942b64738ed61926a
Merge branch 'bug18710_025' into maint-0.2.8
src/or/dnsserv.c