aboutsummaryrefslogtreecommitdiff
path: root/changes/bug12830
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-08 10:20:14 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-08 10:20:14 -0500
commitc3d11b119dbd46fa02a1e26d76ddc74424dd4b18 (patch)
tree2b2b60ffbfd4e3a9613dc030ba77e9cb22104ce0 /changes/bug12830
parent432852577000ab5eb07ae3ca961a36e5f6e796ba (diff)
parent35deb4d442da38d7dcfb235665da50f3a4f7c293 (diff)
downloadtor-c3d11b119dbd46fa02a1e26d76ddc74424dd4b18.tar.gz
tor-c3d11b119dbd46fa02a1e26d76ddc74424dd4b18.zip
Merge branch 'maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'changes/bug12830')
0 files changed, 0 insertions, 0 deletions