commit c7113e702b7e0ad1f33eb72cc8fffc5f26d0ae64 Merge: 86907ea 264aa27 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 5 09:59:07 2013 -0400

Merge remote-tracking branch 'public/bug9645'

changes/bug9645a | 5 +++++ src/or/microdesc.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-)