commit 448bd220928f337e60dd377e8a3bb814248f4a7a Merge: 6263190 ceb6dee Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 9 13:17:20 2015 -0400

Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5

changes/bug14261 | 5 +++++ src/or/directory.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)