]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge commit 'origin/maint-0.2.1'
authorNick Mathewson <nickm@torproject.org>
Thu, 17 Sep 2009 03:37:27 +0000 (23:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 17 Sep 2009 03:37:27 +0000 (23:37 -0400)
commitcb78602379c336f40cf4e880d45ba4e766fb8c31
treedc8f55886af9083cf534f9894bdc2fded5e0d60e
parent4850a3a75f4fa7da10d0c2bce23f0a517c6a29cb
parentb3991ea7d15c18dc33d4761f61f2e90ad49ab4b8
Merge commit 'origin/maint-0.2.1'

[Do not take conflicting change to rendclient.c]
ChangeLog