commit f4b79bc4208132d057a7be04e6135480129c5048 Merge: 55639bc 4cb59ce Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 2 10:23:52 2015 -0500

Merge remote-tracking branch 'sysrqb/bug14216_bad_since'

changes/bug14216 | 5 +++++ src/or/entrynodes.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-)