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

[nickm at torproject.org]

commit fae72a8d0a749a99b9b518c2234aeb5c30552f69
Merge: efdac2a 9407040
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jan 18 15:41:13 2015 -0500

    Merge remote-tracking branch 'public/bug14219_025'

 changes/bug14219    |    6 ++++++
 src/or/rendcommon.c |   11 ++---------
 2 files changed, 8 insertions(+), 9 deletions(-)