[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/bug11742'

[nickm at torproject.org]

commit c7549cb4cde5f157c8df4c60c29b29281600b61d
Merge: 78301d9 1289474
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 6 13:54:37 2014 -0400

    Merge remote-tracking branch 'karsten/bug11742'

 changes/bug11742   |    4 ++
 src/or/directory.c |   16 -------
 src/or/rephist.c   |  122 ----------------------------------------------------
 src/or/rephist.h   |    1 -
 4 files changed, 4 insertions(+), 139 deletions(-)