]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'andrea/ticket15358_squashed_2'
authorNick Mathewson <nickm@torproject.org>
Mon, 18 May 2015 18:44:28 +0000 (14:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 May 2015 18:44:28 +0000 (14:44 -0400)
1  2 
src/or/control.c
src/or/control.h

Simple merge
Simple merge