]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Sat, 28 May 2011 06:09:48 +0000 (02:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 28 May 2011 06:09:48 +0000 (02:09 -0400)
commit285cf998bcb5b228d82e7ff2aa13a532eee837a9
tree7c9e46673f99194872591541a6844588b5a7fd32
parent8e09f7cf107056f99e47029ccf9a9403ef45bc59
parentc3199495503930e33e7370d6c364b2b8b35844f4
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/or/eventdns.c
src/or/eventdns.c