commit 274e2817419e9b785f890fe04d791ed9114a8725 Merge: cdd882e f25e8d0 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 17 11:54:05 2012 -0400

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

changes/bug6514 | 5 +++++ src/or/dirvote.c | 1 + 2 files changed, 6 insertions(+), 0 deletions(-)