]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 14:30:16 +0000 (09:30 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 14:30:16 +0000 (09:30 -0500)
commit6c2174d44d01b4c231befe9de5ce2ffb042cc65d
tree09de0c8138b0eb15223e67068188b39663da37f1
parent12a72983766d5265b5259038af711cb172671af7
parentdb2571be619530389c7ca3066cfc86b32cfc7578
Merge branch 'maint-0.2.5' into maint-0.2.6