[tor-commits] [tor/master] Merge branch 'bug6833'

[nickm at torproject.org]

commit 286e95f0a5dcebe226f7b1c3372de540b75ea460
Merge: e4ce8cd 68caa83
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 14 10:10:23 2012 -0400

    Merge branch 'bug6833'

 changes/bug6833      |    4 ++++
 src/or/or.h          |    3 +++
 src/or/routerparse.c |   10 ++++++++++
 3 files changed, 17 insertions(+), 0 deletions(-)