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

commit ee246bbe95a3adbc86ac8eb3794f55011c2059d5 Merge: 891cf72 0888c2f Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 16 10:40:21 2012 -0400 Merge remote-tracking branch 'public/bug3296' changes/bug3296 | 5 +++++ src/or/circuitbuild.c | 4 ++++ src/or/rephist.c | 20 ++++++++++++++++++++ src/or/rephist.h | 1 + 4 files changed, 30 insertions(+), 0 deletions(-)