diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-15 15:29:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-15 15:29:24 -0500 |
| commit | 59f50c80d443a7e148f85cfed493e3e703cc4386 (patch) | |
| tree | bdaef44fe052c88c81c3e5fb130837f6ebc65202 /changes/bug6026 | |
| parent | a82b18f2168ce19e0637740fed5746d6daac4e3a (diff) | |
| parent | 9e907076025ccd91abfad7fc70c09ba4c9228f82 (diff) | |
| download | tor-59f50c80d443a7e148f85cfed493e3e703cc4386.tar tor-59f50c80d443a7e148f85cfed493e3e703cc4386.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/or.h
src/or/relay.c
Conflicts were simple to resolve. More fixes were needed for
compilation, including: reinstating the tv_to_msec function, and renaming
*_conn_cells to *_chan_cells.
Diffstat (limited to 'changes/bug6026')
0 files changed, 0 insertions, 0 deletions