commit 4050800251c77d4fc059c51a268abe02c3d4e9a0 Merge: 7c9f6a9 c4586f4 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 26 10:30:51 2012 -0400

Merge remote-tracking branch 'origin/maint-0.2.3'

changes/bug6238 | 3 +++ src/or/microdesc.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)