Merge commit 'origin/maint-0.2.1'
commite0dc2e907eb029bd4e3d7933ef72f3ff942a9b81
authorNick Mathewson <nickm@torproject.org>
Thu, 13 Aug 2009 02:02:07 +0000 (12 22:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 13 Aug 2009 02:02:07 +0000 (12 22:02 -0400)
tree872cf6e543fbc1b40ac7c4724daa4b189c3945d3
parentafc9da72874b0e443843ef25090a97fab91530ec
parenta98643c1b5a39764204fcf6835a8b2bee670581d
Merge commit 'origin/maint-0.2.1'
ChangeLog
src/or/dirserv.c
src/or/router.c