[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11342'

[nickm at torproject.org]

commit f82e499aa58be77ac91b04eedbc43409681100d0
Merge: 5e0cfba bfe783f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 31 10:51:09 2014 -0400

    Merge remote-tracking branch 'public/bug11342'

 changes/bug11342     |    4 ++++
 src/or/routerparse.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)