Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Wed, 6 Jun 2012 21:06:57 +0000 (17:06 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 6 Jun 2012 21:06:57 +0000 (17:06 -0400)
commit90daab61848eb3d2b1a461fc79755e2969de6aa6
tree92763f563cf70ee726eb428a3b74df5437bc8ff1
parent0bbd850cc077e5555128f5b6dfce00a54b65526b
parent60f65403412c940f51a10c6e283acea9fe6b79cf
Merge remote-tracking branch 'origin/patches-2.0'
test/test-changelist.c
test/test-ratelim.c