]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug6304_v3' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Mar 2013 14:31:28 +0000 (10:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Mar 2013 14:31:56 +0000 (10:31 -0400)
commit5b0b51ca3ff55d6e82081adf4cb1dbfa24ac4872
tree23f6d7ccd5e79a3e25726c2df0912dee48dc5528
parentf1caa2f2146ac750962e6506fe672b03749c50f9
parentb9a8f8c17ce11dd867e0afec7cbb65c55a3d7e8c
Merge remote-tracking branch 'public/bug6304_v3' into maint-0.2.4

Conflicts:
src/or/circuitbuild.c
src/or/config.c
src/or/circuitstats.c
src/or/config.c