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

[nickm at torproject.org]

commit 3ddbf2880f315784280e0b8367e5e08043b4236e
Merge: ddaeb4d b00f10b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Mar 23 15:56:23 2014 -0400

    Merge remote-tracking branch 'public/bug11275_024'

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