commit 03e3cf6a7aa86c74d01cebd61c9ad89200661e73
Merge: f18ee7f e0b7598
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Jun 25 10:40:58 2015 -0400
Merge remote-tracking branch 'public/bug16400_026' into maint-0.2.6
changes/bug16400 | 5 +++++
src/or/routerparse.c | 14 +++++++++++---
src/test/test_microdesc.c | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 50 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
