intertwingle the 0.1.1.x and 0.1.2.x changelog entries
commitf5dd56ad2b05ba66fe8aa87d718abcd0e7841e1e
authorRoger Dingledine <arma@torproject.org>
Fri, 26 Jan 2007 06:44:38 +0000 (26 06:44 +0000)
committerRoger Dingledine <arma@torproject.org>
Fri, 26 Jan 2007 06:44:38 +0000 (26 06:44 +0000)
tree83983a958ca7044b5760c3d08c469d618ff2d659
parenta6df62b053955249106ec89655a8e336c9d26210
intertwingle the 0.1.1.x and 0.1.2.x changelog entries

svn:r9419
ChangeLog