[tor-commits] [tor/master] Merge remote-tracking branch 'rransom-tor/typo-fix-ohkah8Ah'

[nickm at torproject.org]

commit 35f9be7d044f17d0f7fc17a35eaf6f93df2ec34f
Merge: ae2856b c621e52
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Sep 10 17:45:27 2011 -0400

    Merge remote-tracking branch 'rransom-tor/typo-fix-ohkah8Ah'

 changes/typo-fix-ohkah8Ah |    9 +++++++++
 src/or/rendservice.c      |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)