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

[nickm at torproject.org]

commit 5511d21d2b99fb686f3ad57be1a16d383f77adc9
Merge: c3f526e 96d2a21
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 17 10:28:35 2012 -0400

    Merge branch 'bug6861_typofix'

 changes/bug6861     |    3 +++
 src/or/rendclient.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)