[tor-commits] [tor/master] Merge branch 'master' of git-rw.torproject.org:/tor

[nickm at torproject.org]

commit 511c9006867926cbfcc824567b37e78856fa46d9
Merge: b80a35e cabad0b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 24 10:25:00 2017 -0400

    Merge branch 'master' of git-rw.torproject.org:/tor

 src/or/nodelist.c | 10 ----------
 src/or/nodelist.h |  1 -
 2 files changed, 11 deletions(-)