]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 02:16:07 +0000 (22:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 02:16:07 +0000 (22:16 -0400)
commitef83db4fe85f2c73b5891d5b8e53ca776dc230f8
tree921ca883fac4b8f39daacbfcdd50aedad79c0cb4
parent68ea7d24d8e1ceb594ae5a63a3d433bd78a079cd
parentf8bb0064d6a06770e6187ba57a2f4a764336aa84
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/config.c
src/or/connection.c