[tor-commits] [tor/master] Merge remote-tracking branch 'jigsaw52/fix_leak_21788'

[nickm at torproject.org]

commit 61e8ee111725f17ae736a611029b330b7fa4c88b
Merge: 1d617e3 e843481
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 27 11:01:01 2017 +0200

    Merge remote-tracking branch 'jigsaw52/fix_leak_21788'

 src/or/main.c | 1 +
 1 file changed, 1 insertion(+)