]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Fri, 29 Aug 2014 20:13:04 +0000 (16:13 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 29 Aug 2014 20:13:04 +0000 (16:13 -0400)
commitd6fa8239c86f49413e9ee86765059f43ceeb06c6
treee4b2af85812b8490a4c77d86fe8b2d38adf98447
parent573d62748ab2cacfdbba5ea04e855d56708d34e8
parent4a6f5bb2dda188ed1d1a80455bf9c9b0b3f00066
Merge remote-tracking branch 'origin/maint-0.2.5'