diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-10 22:31:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-10 22:31:06 -0400 |
| commit | 7ea904cbc0acbe1575ff68700572da76e4e4b10d (patch) | |
| tree | e893c6fd57794cc9b9cacdb414292edd2aa8cb16 /LICENSE | |
| parent | 8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9 (diff) | |
| parent | e6d1ab3600c6bbbda7f30093fb7623581a44a325 (diff) | |
| download | tor-7ea904cbc0acbe1575ff68700572da76e4e4b10d.tar tor-7ea904cbc0acbe1575ff68700572da76e4e4b10d.tar.gz | |
Merge branch 'bug7011'
Conflicts:
src/or/circuitbuild.c
The conflict was trivial, since no line of code actually changed in
both branches: There was a fmt_addr() that turned into fmt_addrport()
in bug7011, and a "if (!n_conn)" that turned into "if (!n_chan)" in
master.
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions