[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4
nickm at torproject.org
nickm at torproject.org
Fri Jul 19 03:18:58 UTC 2013
commit 17a960734aa7db59580e647bf67f6ecf587b54c9
Merge: c36bdbd e9c2484
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Jul 18 23:17:05 2013 -0400
Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4
changes/bug9295 | 4 ++++
src/or/config.c | 1 +
2 files changed, 5 insertions(+)
More information about the tor-commits
mailing list