diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-19 14:32:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-19 14:32:22 -0400 |
| commit | 2c2c64287aebe9eaa844457b852ca7cd50c61ec5 (patch) | |
| tree | 7eba47da137b28e8682b7441547843359fa5aaa3 | |
| parent | 0dac0d8ad68f17fa1803ebd82e402e5181e0532a (diff) | |
| parent | 1cc06bd35e4203569ecc72ff314a1dd543f60651 (diff) | |
| download | tor-2c2c64287aebe9eaa844457b852ca7cd50c61ec5.tar.gz tor-2c2c64287aebe9eaa844457b852ca7cd50c61ec5.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
This is an "ours" commit ; I'm merging a separate version of the
block-renegotiate patch into 0.2.4.
0 files changed, 0 insertions, 0 deletions