commit a0398dd3486b5e489b8e6db7490b9c24337161b0 Merge: ff65618 4f19f85 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Aug 23 09:57:14 2016 -0400 Merge remote-tracking branch 'jigsaw/fix-17758' src/or/microdesc.c | 1 + 1 file changed, 1 insertion(+)