diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-12-02 16:17:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-12-02 16:17:52 -0500 |
| commit | 57ff9913b25ff640f4ae45dc9b60bc28c30f53b8 (patch) | |
| tree | 241ab46ee63be6b2aecf03fb52cff2bdb47c4941 /src/or/cpuworker.c | |
| parent | d9edee3a3b98eaae5192f1307197d1a33122ec61 (diff) | |
| parent | 6171bdd1056e3511b1842ac8a3e17aa349616075 (diff) | |
| download | tor-57ff9913b25ff640f4ae45dc9b60bc28c30f53b8.tar.gz tor-57ff9913b25ff640f4ae45dc9b60bc28c30f53b8.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/connection_or.c
The conflict in src/or/connection_or.c is resolved by taking the
version in master, since e27a26d5 already fixed bug 4531 on master.
This merge just adds the changes file from 0.2.2.
Diffstat (limited to 'src/or/cpuworker.c')
0 files changed, 0 insertions, 0 deletions