commit a2b59dba71687b28546ccc99e98f1a6675ccdc91 Merge: 0e20825 a787575 Author: Nick Mathewson nickm@torproject.org Date: Thu May 1 12:34:59 2014 -0400

Merge branch 'bug11654_squashed'

changes/bug11654 | 4 ++++ src/or/nodelist.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)