]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'bug17772_024' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Dec 2015 15:18:31 +0000 (10:18 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Dec 2015 15:18:31 +0000 (10:18 -0500)
commit35deb4d442da38d7dcfb235665da50f3a4f7c293
treeb0e7f7616c1dc3c4f3c2ec5634bc5f649843d052
parentb0867fec964a8692e9c605da82b3a3393eeaf451
parent5138f5ca6957166febe98d5b6841936d7c20d0ad
Merge branch 'bug17772_024' into maint-0.2.4