[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

[nickm at torproject.org]

commit 952ae0ea69214636a426b71581661cf0eb0aaa12
Merge: e908e3a 0d94f78
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 16 16:40:57 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
    
    Conflicts:
    	changes/bug2190
    	changes/forget-rend-descs-on-newnym

 changes/all_descs                   |    4 ----
 changes/bug1074-part2               |    6 ------
 changes/bug1172                     |    9 ---------
 changes/bug2190                     |   11 -----------
 changes/bug2305                     |    5 -----
 changes/bug2313                     |    4 ----
 changes/bug2324                     |    4 ----
 changes/bug2324_uncompress          |    5 -----
 changes/bug2326                     |    6 ------
 changes/bug2328                     |    9 ---------
 changes/bug2332                     |    4 ----
 changes/bug2352                     |    6 ------
 changes/bug2384                     |    6 ------
 changes/bug2408                     |    6 ------
 changes/bug2470                     |    5 -----
 changes/bug2475                     |    5 -----
 changes/bug2629                     |    5 -----
 changes/bug2750                     |    6 ------
 changes/bug2933                     |    4 ----
 changes/dhparam                     |    3 ---
 changes/forget-rend-descs-on-newnym |   21 ---------------------
 changes/gabelmoo-newip              |    3 ---
 changes/geoip-apr2011               |    3 ---
 changes/geoip-dec2010               |    3 ---
 changes/geoip-feb2011               |    3 ---
 changes/geoip-jan2011               |    3 ---
 changes/geoip-mar2011               |    3 ---
 changes/ipv6_crash                  |    4 ----
 changes/mingw-openssl098m           |    3 ---
 changes/policy_summarize-assert     |    6 ------
 changes/remove-website              |    5 -----
 changes/routerparse_maxima          |    4 ----
 changes/security_bug                |    5 -----
 changes/tolen_asserts               |    8 --------
 changes/torspec.git                 |    5 -----
 changes/zlib_aint_openssl           |    3 ---
 36 files changed, 0 insertions(+), 195 deletions(-)